[joltphysics] Disable treats all compiler warnings as errors (#29271)

* [joltphysics] Disable warning C5266 * update version * apply suggestion * update version
microsoft · Jan 31, 2023 · 0a8ac2f · 0a8ac2f
1 parent b4f29c5
commit 0a8ac2f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/ports/joltphysics/disable-warningC5266.patch b/ports/joltphysics/disable-warningC5266.patch
@@ -0,0 +1,13 @@
+diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt
+index 27c4c64..78f3947 100644
+--- a/Build/CMakeLists.txt
++++ b/Build/CMakeLists.txt
+@@ -53,7 +53,7 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA
+ 	endif()
+
+ 	# Set general compiler flags
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi")
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX- /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi")
+
+ 	# Remove any existing compiler flag that enables RTTI
+ 	string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake
@@ -3,9 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jrouwe/JoltPhysics
-    REF v2.0.1
+    REF "v${VERSION}"
     SHA512 c5848fe7a28de1b34259d3d21e4cd35bec4002eee926445e05d902934c43ab4cafcfa24ceb037c59cc66c3dcea5f3a737546f88c20be594dafe6ce6d1f637abb
     HEAD_REF master
+    PATCHES
+        disable-warningC5266.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT)
@@ -43,4 +45,4 @@ else()
 endif()
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "joltphysics",
   "version": "2.0.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications",
   "homepage": "https://github.com/jrouwe/JoltPhysics",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3262,7 +3262,7 @@
     },
     "joltphysics": {
       "baseline": "2.0.1",
-      "port-version": 1
+      "port-version": 2
     },
     "josuttis-jthread": {
       "baseline": "2020-07-21",

diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "845755ddfb9fa5d6f88c836cffdb1f497e69ad46",
+      "version": "2.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "5e739c5e65a72603e92f5ca31b07a8a78a918166",
       "version": "2.0.1",