From c82131d16e0efded12ac646c661813189306406f Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Wed, 6 Sep 2017 14:18:35 -0700 Subject: [PATCH] cmake fixes --- CMakeLists.txt | 14 ++++++++++++++ Extras/ConvexDecomposition/CMakeLists.txt | 5 ++++- Extras/GIMPACTUtils/CMakeLists.txt | 5 ++++- Extras/HACD/CMakeLists.txt | 6 +++++- Extras/InverseDynamics/CMakeLists.txt | 5 ++++- Extras/Serialize/BulletFileLoader/CMakeLists.txt | 5 ++++- .../Serialize/BulletWorldImporter/CMakeLists.txt | 5 ++++- .../BulletXmlWorldImporter/CMakeLists.txt | 6 +++++- examples/CMakeLists.txt | 11 ----------- 9 files changed, 44 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bf1bcf71..bab4aa4af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,20 @@ IF (BULLET2_USE_THREAD_LOCKS) ENDIF (MSVC) ENDIF (BULLET2_USE_THREAD_LOCKS) +IF(NOT WIN32) + SET(DL dl) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(OSDEF -D_LINUX) + ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux") + IF(APPLE) + SET(OSDEF -D_DARWIN) + ELSE(APPLE) + SET(OSDEF -D_BSD) + SET(DL "") + ENDIF(APPLE) + ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +ENDIF(NOT WIN32) + OPTION(USE_MSVC_INCREMENTAL_LINKING "Use MSVC Incremental Linking" OFF) OPTION(USE_CUSTOM_VECTOR_MATH "Use custom vectormath library" OFF) diff --git a/Extras/ConvexDecomposition/CMakeLists.txt b/Extras/ConvexDecomposition/CMakeLists.txt index 693e9d26a..132a336fa 100644 --- a/Extras/ConvexDecomposition/CMakeLists.txt +++ b/Extras/ConvexDecomposition/CMakeLists.txt @@ -49,7 +49,10 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS ConvexDecomposition DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS ConvexDecomposition DESTINATION lib${LIB_SUFFIX}) + 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) diff --git a/Extras/GIMPACTUtils/CMakeLists.txt b/Extras/GIMPACTUtils/CMakeLists.txt index 5c9480a97..c32a885df 100644 --- a/Extras/GIMPACTUtils/CMakeLists.txt +++ b/Extras/GIMPACTUtils/CMakeLists.txt @@ -22,7 +22,10 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS GIMPACTUtils DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS GIMPACTUtils DESTINATION lib${LIB_SUFFIX}) + 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) diff --git a/Extras/HACD/CMakeLists.txt b/Extras/HACD/CMakeLists.txt index 664a51a5c..a91d1173c 100644 --- a/Extras/HACD/CMakeLists.txt +++ b/Extras/HACD/CMakeLists.txt @@ -36,7 +36,11 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS HACD DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS HACD DESTINATION lib${LIB_SUFFIX}) + INSTALL(TARGETS HACD + 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 "*.inl" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) diff --git a/Extras/InverseDynamics/CMakeLists.txt b/Extras/InverseDynamics/CMakeLists.txt index 1e2031fcb..22e953a44 100644 --- a/Extras/InverseDynamics/CMakeLists.txt +++ b/Extras/InverseDynamics/CMakeLists.txt @@ -32,7 +32,10 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS BulletInverseDynamicsUtils DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletInverseDynamicsUtils DESTINATION lib${LIB_SUFFIX}) + 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) diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt index e88720ad3..9b5dce7ea 100644 --- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt +++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt @@ -34,7 +34,10 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS BulletFileLoader DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX}) + INSTALL(TARGETS BulletFileLoader + 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 diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt index 599625183..3e6f00f10 100644 --- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt @@ -25,7 +25,10 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS BulletWorldImporter DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletWorldImporter DESTINATION lib${LIB_SUFFIX}) + 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) diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt index f45342101..3a9606288 100644 --- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt @@ -32,7 +32,11 @@ IF (INSTALL_EXTRA_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS BulletXmlWorldImporter DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletXmlWorldImporter DESTINATION lib${LIB_SUFFIX}) + INSTALL(TARGETS BulletXmlWorldImporter + 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) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d5cb18207..8f2f9503d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,16 +1,5 @@ SUBDIRS( HelloWorld BasicDemo ) IF(BUILD_BULLET3) - SET(DL dl) - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(OSDEF -D_LINUX) - ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux") - IF(APPLE) - SET(OSDEF -D_DARWIN) - ELSE(APPLE) - SET(OSDEF -D_BSD) - SET(DL "") - ENDIF(APPLE) - ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") SUBDIRS( ExampleBrowser RobotSimulator SharedMemory ThirdPartyLibs/Gwen ThirdPartyLibs/BussIK ThirdPartyLibs/clsocket OpenGLWindow ) ENDIF() IF(BUILD_PYBULLET)