Bumps bullet to 3.17 (#18295)

5 files changed, 122 insertions, 110 deletions

diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL
index 4c91594cd..8fe36ea2f 100644
--- a/ports/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@@ -1,5 +1,5 @@
 Source: bullet3

-Version: 2.89-1

+Version: 3.17

 Homepage: https://github.com/bulletphysics/bullet3

 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library

 

diff --git a/ports/bullet3/cmake-fix.patch b/ports/bullet3/cmake-fix.patch
index c8339e51e..dacc1271e 100644
--- a/ports/bullet3/cmake-fix.patch
+++ b/ports/bullet3/cmake-fix.patch
@@ -1,17 +1,9 @@
+
 diff --git a/BulletConfig.cmake.in b/BulletConfig.cmake.in
-index f5dc7bdbb..f5412dac3 100644
+index f5dc7bdbb..8fb38ce06 100644
 --- a/BulletConfig.cmake.in
 +++ b/BulletConfig.cmake.in
-@@ -3,6 +3,8 @@
- #  BulletConfig.cmake(.in)
- #
- 
-+@PACKAGE_INIT@
-+
- # Use the following variables to compile and link against Bullet:
- #  BULLET_FOUND              - True if Bullet was found on your system
- #  BULLET_USE_FILE           - The file making Bullet usable
-@@ -15,11 +17,20 @@
+@@ -15,11 +15,20 @@
  #  BULLET_VERSION_STRING     - A human-readable string containing the version
  
  set ( BULLET_FOUND 1 )
@@ -39,8 +31,9 @@ index f5dc7bdbb..f5412dac3 100644
 +  endforeach()
 +  set(_DIR)
 +endif()
+\ No newline at end of file
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68e0a93bc..872e14361 100644
+index a695b7172..d0f74e2a8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -49,7 +42,7 @@ index 68e0a93bc..872e14361 100644
  set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
  cmake_policy(SET CMP0017 NEW)
  #this line has to appear before 'PROJECT' in order to be able to disable incremental linking
-@@ -465,23 +465,34 @@ IF (BUILD_UNIT_TESTS)
+@@ -489,7 +489,14 @@ IF (BUILD_UNIT_TESTS)
  	SUBDIRS(test)
  ENDIF()
  
@@ -62,9 +55,10 @@ index 68e0a93bc..872e14361 100644
 +)
 +
 +set (BULLET_CONFIG_CMAKE_PATH share/bullet3 )
+ list (APPEND BULLET_DEFINITIONS ${BULLET_DOUBLE_DEF})
  list (APPEND BULLET_LIBRARIES LinearMath)
  list (APPEND BULLET_LIBRARIES Bullet3Common)
- list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
+@@ -497,16 +504,18 @@ list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
  list (APPEND BULLET_LIBRARIES BulletCollision)
  list (APPEND BULLET_LIBRARIES BulletDynamics)
  list (APPEND BULLET_LIBRARIES BulletSoftBody)
@@ -73,14 +67,12 @@ index 68e0a93bc..872e14361 100644
 -					${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
 -					@ONLY ESCAPE_QUOTES
 -				)
-+
 +configure_package_config_file(
 +	${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
 +	${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
 +	PATH_VARS INCLUDE_INSTALL_DIR LIB_DESTINATION CMAKE_INSTALL_PREFIX BULLET_CONFIG_CMAKE_PATH
 +	INSTALL_DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
 +)
-+
  OPTION(INSTALL_CMAKE_FILES "Install generated CMake files" ON)
  
  IF (INSTALL_CMAKE_FILES)
@@ -90,38 +82,94 @@ index 68e0a93bc..872e14361 100644
  		DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
  	)
  ENDIF (INSTALL_CMAKE_FILES)
-diff --git a/src/Bullet3Common/CMakeLists.txt b/src/Bullet3Common/CMakeLists.txt
-index e899e67d9..0ca702eb8 100644
---- a/src/Bullet3Common/CMakeLists.txt
-+++ b/src/Bullet3Common/CMakeLists.txt
-@@ -43,9 +43,12 @@ IF (INSTALL_LIBS)
+diff --git a/src/Bullet3Geometry/CMakeLists.txt b/src/Bullet3Geometry/CMakeLists.txt
+index 820687270..e51fb64ec 100644
+--- a/src/Bullet3Geometry/CMakeLists.txt
++++ b/src/Bullet3Geometry/CMakeLists.txt
+@@ -27,9 +27,12 @@ IF (INSTALL_LIBS)
+ 		#FILES_MATCHING requires CMake 2.6
+ 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+ 			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-				INSTALL(TARGETS Bullet3Geometry DESTINATION .)
++							INSTALL(TARGETS Bullet3Geometry
++								EXPORT Bullet3GeometryTargets
++								DESTINATION .)
+ 			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 				INSTALL(TARGETS Bullet3Geometry
++					EXPORT Bullet3GeometryTargets
+ 					RUNTIME DESTINATION bin
+ 					LIBRARY DESTINATION lib${LIB_SUFFIX}
+ 					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+@@ -43,5 +46,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+ 			SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES FRAMEWORK true)
+ 			SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES PUBLIC_HEADER "${Bullet3Geometry_HDRS}")
+ 		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
++
++		INSTALL(EXPORT Bullet3GeometryTargets
++			DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
+ 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ ENDIF (INSTALL_LIBS)
+diff --git a/src/Bullet3OpenCL/CMakeLists.txt b/src/Bullet3OpenCL/CMakeLists.txt
+index 1da58d4a9..5f3c234b3 100644
+--- a/src/Bullet3OpenCL/CMakeLists.txt
++++ b/src/Bullet3OpenCL/CMakeLists.txt
+@@ -53,9 +53,13 @@ IF (INSTALL_LIBS)
+ 		#INSTALL of other files requires CMake 2.6
+ 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+ 			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-				INSTALL(TARGETS Bullet3OpenCL_clew DESTINATION .)
++				INSTALL(TARGETS BulletDynamics
++					EXPORT Bullet3OpenCLTargets
++					DESTINATION .)
+ 			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-				INSTALL(TARGETS Bullet3OpenCL_clew RUNTIME DESTINATION bin
++				INSTALL(TARGETS Bullet3OpenCL_clew
++								EXPORT Bullet3OpenCLTargets
++								RUNTIME DESTINATION bin
+ 								LIBRARY DESTINATION lib${LIB_SUFFIX}
+ 								ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ 				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+@@ -73,5 +77,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E
+ 			SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
+ 
+ 		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
++
++		INSTALL(EXPORT Bullet3OpenCLTargets
++			DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
+ 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ ENDIF (INSTALL_LIBS)
+diff --git a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
+index 125576634..67112b40b 100644
+--- a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
++++ b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
+@@ -35,9 +35,12 @@ IF (INSTALL_LIBS)
  		#FILES_MATCHING requires CMake 2.6
  		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
  			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
--				INSTALL(TARGETS Bullet3Common DESTINATION .)
-+				INSTALL(TARGETS Bullet3Common
-+					EXPORT Bullet3CommonTargets
+-				INSTALL(TARGETS Bullet2FileLoader DESTINATION .)
++				INSTALL(TARGETS Bullet2FileLoader
++					EXPORT Bullet2FileLoaderTargets
 +					DESTINATION .)
  			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
- 				INSTALL(TARGETS Bullet3Common
-+					EXPORT Bullet3CommonTargets
+ 				INSTALL(TARGETS Bullet2FileLoader
++					EXPORT Bullet2FileLoaderTargets
  					RUNTIME DESTINATION bin
  					LIBRARY DESTINATION lib${LIB_SUFFIX}
  					ARCHIVE DESTINATION lib${LIB_SUFFIX})
-@@ -59,5 +62,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
- 			SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES FRAMEWORK true)
- 			SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES PUBLIC_HEADER "${Bullet3Common_HDRS}")
+@@ -51,5 +54,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+ 			SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES FRAMEWORK true)
+ 			SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES PUBLIC_HEADER "${Bullet2FileLoader_HDRS}")
  		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 +
-+		INSTALL(EXPORT Bullet3CommonTargets
++		INSTALL(EXPORT Bullet2FileLoaderTargets
 +			DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
  	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
  ENDIF (INSTALL_LIBS)
 diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt
-index f5d725562..e98de8ba2 100644
+index f5d725562..23516ca34 100644
 --- a/src/BulletCollision/CMakeLists.txt
 +++ b/src/BulletCollision/CMakeLists.txt
-@@ -266,11 +266,15 @@ IF (INSTALL_LIBS)
+@@ -266,9 +266,13 @@ IF (INSTALL_LIBS)
  		#INSTALL of other files requires CMake 2.6
  		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
  			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
@@ -131,16 +179,12 @@ index f5d725562..e98de8ba2 100644
 +					DESTINATION .)
  			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -				INSTALL(TARGETS BulletCollision RUNTIME DESTINATION bin
--								LIBRARY DESTINATION lib${LIB_SUFFIX}
--								ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+				INSTALL(TARGETS BulletCollision
-+					EXPORT BulletCollisionTargets
-+					RUNTIME DESTINATION bin
-+					LIBRARY DESTINATION lib${LIB_SUFFIX}
-+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
++				INSTALL(TARGETS BulletCollision 
++								EXPORT BulletCollisionTargets
++								RUNTIME DESTINATION bin
+ 								LIBRARY DESTINATION lib${LIB_SUFFIX}
+ 								ARCHIVE DESTINATION lib${LIB_SUFFIX})
  				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
- 				INSTALL(FILES ../btBulletCollisionCommon.h
 @@ -290,5 +294,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision)
  			SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
  
@@ -151,10 +195,10 @@ index f5d725562..e98de8ba2 100644
  	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
  ENDIF (INSTALL_LIBS)
 diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt
-index 3332440f2..3bbce4389 100644
+index 3332440f2..db4444e4d 100644
 --- a/src/BulletDynamics/CMakeLists.txt
 +++ b/src/BulletDynamics/CMakeLists.txt
-@@ -147,11 +147,15 @@ IF (INSTALL_LIBS)
+@@ -147,9 +147,13 @@ IF (INSTALL_LIBS)
  	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
  		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
  			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
@@ -164,29 +208,26 @@ index 3332440f2..3bbce4389 100644
 +					DESTINATION .)
  			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -				INSTALL(TARGETS BulletDynamics RUNTIME DESTINATION bin
--								LIBRARY DESTINATION lib${LIB_SUFFIX}
--								ARCHIVE DESTINATION lib${LIB_SUFFIX})
 +				INSTALL(TARGETS BulletDynamics
-+					EXPORT BulletDynamicsTargets
-+					RUNTIME DESTINATION bin
-+					LIBRARY DESTINATION lib${LIB_SUFFIX}
-+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
++								EXPORT BulletDynamicsTargets 
++								RUNTIME DESTINATION bin
+ 								LIBRARY DESTINATION lib${LIB_SUFFIX}
+ 								ARCHIVE DESTINATION lib${LIB_SUFFIX})
  				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
- ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
-@@ -172,4 +176,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics)
+@@ -171,5 +175,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics)
+ 			SET_PROPERTY(SOURCE ${Featherstone_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Featherstone)
  			SET_PROPERTY(SOURCE ${MLCPSolvers_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MLCPSolvers)
  		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
++
++		INSTALL(EXPORT BulletDynamicsTargets
++			DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
  	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-+	
-+	INSTALL(EXPORT BulletDynamicsTargets
-+		DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
  ENDIF (INSTALL_LIBS)
 diff --git a/src/BulletInverseDynamics/CMakeLists.txt b/src/BulletInverseDynamics/CMakeLists.txt
-index 3331c27ea..86b4e54be 100644
+index 3331c27ea..b5cde24f0 100644
 --- a/src/BulletInverseDynamics/CMakeLists.txt
 +++ b/src/BulletInverseDynamics/CMakeLists.txt
-@@ -42,11 +42,15 @@ IF (INSTALL_LIBS)
+@@ -42,9 +42,13 @@ IF (INSTALL_LIBS)
  		#INSTALL of other files requires CMake 2.6
  		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
  			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
@@ -196,16 +237,12 @@ index 3331c27ea..86b4e54be 100644
 +					DESTINATION .)
  			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -				INSTALL(TARGETS BulletInverseDynamics RUNTIME DESTINATION bin
--								LIBRARY DESTINATION lib${LIB_SUFFIX}
--								ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+				INSTALL(TARGETS BulletInverseDynamics
-+					EXPORT BulletInverseDynamicsTargets
-+					RUNTIME DESTINATION bin
-+					LIBRARY DESTINATION lib${LIB_SUFFIX}
-+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
++				INSTALL(TARGETS BulletInverseDynamics 
++								EXPORT BulletInverseDynamicsTargets
++								RUNTIME DESTINATION bin
+ 								LIBRARY DESTINATION lib${LIB_SUFFIX}
+ 								ARCHIVE DESTINATION lib${LIB_SUFFIX})
  				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
- 				INSTALL(FILES ../btBulletCollisionCommon.h
 @@ -62,5 +66,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics)
  			SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details)
  
@@ -216,10 +253,10 @@ index 3331c27ea..86b4e54be 100644
  	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
  ENDIF (INSTALL_LIBS)
 diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt
-index d43df1c67..6ba508ec5 100644
+index 945276801..5068a3049 100644
 --- a/src/BulletSoftBody/CMakeLists.txt
 +++ b/src/BulletSoftBody/CMakeLists.txt
-@@ -50,11 +50,15 @@ IF (INSTALL_LIBS)
+@@ -78,9 +78,13 @@ IF (INSTALL_LIBS)
  	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
  		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
  			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
@@ -229,17 +266,13 @@ index d43df1c67..6ba508ec5 100644
 +					DESTINATION .)
  			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -			INSTALL(TARGETS BulletSoftBody RUNTIME DESTINATION bin
--							LIBRARY DESTINATION lib${LIB_SUFFIX}
--							ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+				INSTALL(TARGETS BulletSoftBody
-+					EXPORT BulletSoftBodyTargets
-+					RUNTIME DESTINATION bin
-+					LIBRARY DESTINATION lib${LIB_SUFFIX}
-+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
++			INSTALL(TARGETS BulletSoftBody 
++							EXPORT BulletSoftBodyTargets
++							RUNTIME DESTINATION bin
+ 							LIBRARY DESTINATION lib${LIB_SUFFIX}
+ 							ARCHIVE DESTINATION lib${LIB_SUFFIX})
  				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
- ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
-@@ -65,5 +69,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+@@ -93,5 +97,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
  			SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true)
  			SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}")
  		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
@@ -248,30 +281,3 @@ index d43df1c67..6ba508ec5 100644
 +			DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
  	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
  ENDIF (INSTALL_LIBS)
-diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt
-index 0c8c0133a..56d4b5bcc 100644
---- a/src/LinearMath/CMakeLists.txt
-+++ b/src/LinearMath/CMakeLists.txt
-@@ -59,9 +59,12 @@ IF (INSTALL_LIBS)
- 		#FILES_MATCHING requires CMake 2.6
- 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
--				INSTALL(TARGETS LinearMath DESTINATION .)
-+				INSTALL(TARGETS LinearMath
-+					EXPORT LinearMathTargets
-+					DESTINATION .)
- 			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
- 				INSTALL(TARGETS LinearMath
-+					EXPORT LinearMathTargets
- 					RUNTIME DESTINATION bin
- 					LIBRARY DESTINATION lib${LIB_SUFFIX}
- 					ARCHIVE DESTINATION lib${LIB_SUFFIX})
-@@ -75,5 +78,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
- 			SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true)
- 			SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}")
- 		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
-+
-+		INSTALL(EXPORT LinearMathTargets
-+			DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
- 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
- ENDIF (INSTALL_LIBS)
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake
index 82bb8c793..7170b3db5 100644
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@@ -5,14 +5,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bulletphysics/bullet3
-    REF 2.89
-    SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
+    REF 3.17
+    SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
     HEAD_REF master
     PATCHES cmake-fix.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    multithreading       BULLET2_MULTITHREADING
+    FEATURES
+        multithreading       BULLET2_MULTITHREADING
 )
 
 vcpkg_configure_cmake(
diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json
index f7a268006..a8d289a00 100644
--- a/versions/b-/bullet3.json
+++ b/versions/b-/bullet3.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "4fc6b5f085568cedd1171dc99fd75c7e412dcc5a",
+      "version-string": "3.17",
+      "port-version": 0
+    },
+    {
       "git-tree": "5917d99eda4055b22a1e49e6f2a37ebd9dd26e9e",
       "version-string": "2.89-1",
       "port-version": 0
diff --git a/versions/baseline.json b/versions/baseline.json
index 131a21da3..0b78f80cb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1069,7 +1069,7 @@
       "port-version": 0
     },
     "bullet3": {
-      "baseline": "2.89-1",
+      "baseline": "3.17",
       "port-version": 0
     },
     "bustache": {