cmake: Add BULLET_BUILD_SHARED_LIBS to replace BUILD_SHARED_LIBS

CMakeLists.txt

@@ -26,10 +26,16 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 OPTION(USE_DOUBLE_PRECISION "Use double precision"	OFF)
 SET(CLAMP_VELOCITIES "0" CACHE STRING "Clamp rigid bodies' velocity to this value, if larger than zero. Useful to prevent floating point errors or in general runaway velocities in complex scenarios")
 OPTION(USE_GRAPHICAL_BENCHMARK "Use Graphical Benchmark" ON)
-OPTION(BUILD_SHARED_LIBS "Use shared libraries" OFF)
+OPTION(BULLET_BUILD_SHARED_LIBS "Use shared libraries" ${BUILD_SHARED_LIBS})
 OPTION(USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD "Use btSoftMultiBodyDynamicsWorld" ON)
 OPTION(USE_OPENVR "Use OpenVR for virtual reality" OFF)
 
+if(BULLET_BUILD_SHARED_LIBS)
+	set(BULLET_BUILD_TYPE SHARED)
+else()
+	set(BULLET_BUILD_TYPE STATIC)
+endif()
+
 OPTION(ENABLE_VHACD "Use VHACD in BulletRobotics and pybullet" ON)
 
 OPTION(BULLET2_MULTITHREADING "Build Bullet 2 libraries with mutex locking around certain operations (required for multi-threading)" OFF)
@@ -374,9 +380,9 @@ IF(BUILD_PYBULLET)
 	ENDIF()
 
 	IF(WIN32)
-		SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Shared Libs" FORCE)
+		SET(BULLET_BUILD_SHARED_LIBS OFF CACHE BOOL "Shared Libs" FORCE)
 	ELSE(WIN32)
-		SET(BUILD_SHARED_LIBS ON CACHE BOOL "Shared Libs" FORCE)
+		SET(BULLET_BUILD_SHARED_LIBS ON CACHE BOOL "Shared Libs" FORCE)
 	ENDIF(WIN32)
 
 	IF(APPLE)

Extras/BulletRobotics/CMakeLists.txt

@@ -276,14 +276,14 @@ ENDIF()
 ADD_DEFINITIONS(-DPHYSICS_SERVER_DIRECT)
 
 
-ADD_LIBRARY(BulletRobotics ${BulletRobotics_SRCS})
+add_library(BulletRobotics ${BULLET_BUILD_TYPE} ${BulletRobotics_SRCS})
 
 SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 
 
@@ -298,10 +298,10 @@ INSTALL (
 		ARCHIVE DESTINATION lib${LIB_SUFFIX}
 	)
 
-  IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+  IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
     SET_TARGET_PROPERTIES(BulletRobotics  PROPERTIES FRAMEWORK true)
     SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES PUBLIC_HEADER "PhysicsClientC_API.h" )
-  ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)	
+  ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)	
 
 IF(NOT MSVC)
     SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")

Extras/BulletRoboticsGUI/CMakeLists.txt

@@ -160,14 +160,14 @@ ENDIF(BUILD_ENET)
 ADD_DEFINITIONS(-DPHYSICS_SERVER_DIRECT)
 
 
-ADD_LIBRARY(BulletRoboticsGUI ${BulletRoboticsGUI_SRCS})
+add_library(BulletRoboticsGUI ${BULLET_BUILD_TYPE} ${BulletRoboticsGUI_SRCS})
 
 SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletRoboticsGUI  BulletExampleBrowserLib BulletRobotics  BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 
 
@@ -177,10 +177,10 @@ ENDIF (BUILD_SHARED_LIBS)
 		ARCHIVE DESTINATION lib${LIB_SUFFIX}
 	)
 
-  IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+  IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
     SET_TARGET_PROPERTIES(BulletRobotics  PROPERTIES FRAMEWORK true)
     SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES PUBLIC_HEADER "PhysicsClientC_API.h" )
-  ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)	
+  ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)	
 
 IF(NOT MSVC)
     SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")

Extras/ConvexDecomposition/CMakeLists.txt

@@ -34,34 +34,34 @@ SET(ConvexDecomposition_HDRS
 	cd_hull.h
 )
 
-ADD_LIBRARY(ConvexDecomposition ${ConvexDecomposition_SRCS} ${ConvexDecomposition_HDRS})
+add_library(ConvexDecomposition ${BULLET_BUILD_TYPE} ${ConvexDecomposition_SRCS} ${ConvexDecomposition_HDRS})
 SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
   TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS ConvexDecomposition DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS ConvexDecomposition
                                         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)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES PUBLIC_HEADER "${ConvexDecomposition_HDRS}")
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/GIMPACTUtils/CMakeLists.txt

@@ -11,30 +11,30 @@ btGImpactConvexDecompositionShape.cpp	btGImpactConvexDecompositionShape.h
 SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
   TARGET_LINK_LIBRARIES(GIMPACTUtils ConvexDecomposition BulletCollision)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS GIMPACTUtils DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS GIMPACTUtils 
                                         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)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES PUBLIC_HEADER "btGImpactConvexDecompositionShape.h")
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/HACD/CMakeLists.txt

@@ -21,21 +21,21 @@ SET(HACD_HDRS
 	hacdVector.inl
 )
 
-ADD_LIBRARY(HACD ${HACD_SRCS} ${HACD_HDRS})
+add_library(HACD ${BULLET_BUILD_TYPE} ${HACD_SRCS} ${HACD_HDRS})
 SET_TARGET_PROPERTIES(HACD PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(HACD PROPERTIES SOVERSION ${BULLET_VERSION})
 
-#IF (BUILD_SHARED_LIBS)
+#IF (BULLET_BUILD_SHARED_LIBS)
 #  TARGET_LINK_LIBRARIES(HACD BulletCollision LinearMath)
-#ENDIF (BUILD_SHARED_LIBS)
+#ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS HACD DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS HACD
                                         RUNTIME DESTINATION bin
                                         LIBRARY DESTINATION lib${LIB_SUFFIX}
@@ -44,12 +44,12 @@ IF (INSTALL_EXTRA_LIBS)
 				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 					DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN "*.inl" PATTERN
 					".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(HACD PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(HACD PROPERTIES PUBLIC_HEADER "${HACD_HDRS}")
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/InverseDynamics/CMakeLists.txt

@@ -21,30 +21,30 @@ User2InternalIndex.cpp
 SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletInverseDynamicsUtils  DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletInverseDynamicsUtils
                                         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)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils  PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES PUBLIC_HEADER "BulletInverseDynamicsUtilsCommon.h" )
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/Serialize/BlenderSerialize/CMakeLists.txt

@@ -4,4 +4,4 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BlenderSerialize
 )
 
-ADD_LIBRARY(BlenderSerialize dna249.cpp dna249-64bit.cpp bBlenderFile.cpp  bBlenderFile.h bMain.cpp bMain.h )
+add_library(BlenderSerialize ${BULLET_BUILD_TYPE} dna249.cpp dna249-64bit.cpp bBlenderFile.cpp  bBlenderFile.h bMain.cpp bMain.h )

Extras/Serialize/BulletFileLoader/CMakeLists.txt

@@ -18,11 +18,11 @@ bFile.h
 btBulletFile.h
 )
 
-ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
+add_library(BulletFileLoader ${BULLET_BUILD_TYPE} ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
@@ -31,9 +31,9 @@ IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletFileLoader DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletFileLoader
                                         RUNTIME DESTINATION bin
                                         LIBRARY DESTINATION lib${LIB_SUFFIX}
@@ -42,12 +42,12 @@ IF (INSTALL_EXTRA_LIBS)
 					DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 					DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
 					".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}")
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/Serialize/BulletWorldImporter/CMakeLists.txt

@@ -15,30 +15,30 @@ btWorldImporter.h
 SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletWorldImporter DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletWorldImporter
                                         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)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES PUBLIC_HEADER "btBulletWorldImporter.h")
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt

@@ -17,17 +17,17 @@ ADD_LIBRARY(
 SET_TARGET_PROPERTIES(BulletXmlWorldImporter  PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
 
-IF (BUILD_SHARED_LIBS)
+IF (BULLET_BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+ENDIF (BULLET_BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
 	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletXmlWorldImporter DESTINATION .)
-			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ELSE (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletXmlWorldImporter 
                                         RUNTIME DESTINATION bin
                                         LIBRARY DESTINATION lib${LIB_SUFFIX}
@@ -36,12 +36,12 @@ IF (INSTALL_EXTRA_LIBS)
 				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
 ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
-			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		IF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES FRAMEWORK true)
 			SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES PUBLIC_HEADER "btBulletXmlWorldImporter.h")
-		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (APPLE AND BULLET_BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_EXTRA_LIBS)

Extras/Serialize/makesdna/CMakeLists.txt

@@ -46,6 +46,6 @@ ENDIF()
 # Build bf_dna library
 
 
-ADD_LIBRARY(BulletDNA ${SRC} ${INC_FILES})
+add_library(BulletDNA ${BULLET_BUILD_TYPE} ${SRC} ${INC_FILES})
 
 MESSAGE(STATUS "Configuring makesdna")