Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Export targets in CMake and add include directories to target properties"

Browse Source
This commit is contained in:
erwincoumans
2017-09-10 21:20:54 -07:00
committed by GitHub
parent 7fd29ac0fe
commit 6f51d81cbb
22 changed files with 192 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BulletConfig.cmake.in
View File

@@ -14,16 +14,12 @@
# BULLET_ROOT_DIR - The base directory of Bullet # BULLET_ROOT_DIR - The base directory of Bullet
# BULLET_VERSION_STRING - A human-readable string containing the version # BULLET_VERSION_STRING - A human-readable string containing the version
@PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/BulletExport.cmake")
set ( BULLET_FOUND 1 ) set ( BULLET_FOUND 1 )
set ( BULLET_USE_FILE "${PACKAGE_PREFIX_DIR}/@BULLET_USE_FILE@" ) set ( BULLET_USE_FILE "@BULLET_USE_FILE@" )
set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" ) set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" )
set ( BULLET_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@INCLUDE_INSTALL_DIR@" ) set ( BULLET_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" )
set ( BULLET_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@INCLUDE_INSTALL_DIR@" ) set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" )
set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" ) set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" )
set ( BULLET_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@LIB_DESTINATION@" ) set ( BULLET_LIBRARY_DIRS "@LIB_DESTINATION@" )
set ( BULLET_ROOT_DIR "${PACKAGE_PREFIX_DIR}" ) set ( BULLET_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" )
set ( BULLET_VERSION_STRING "@BULLET_VERSION@" ) set ( BULLET_VERSION_STRING "@BULLET_VERSION@" )

57
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.4.3)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
cmake_policy(SET CMP0017 NEW) cmake_policy(SET CMP0017 NEW)
#this line has to appear before 'PROJECT' in order to be able to disable incremental linking #this line has to appear before 'PROJECT' in order to be able to disable incremental linking
@@ -15,9 +15,6 @@ IF(COMMAND cmake_policy)
endif(POLICY CMP0042) endif(POLICY CMP0042)
ENDIF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
IF (NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_BUILD_TYPE)
# SET(CMAKE_BUILD_TYPE "Debug") # SET(CMAKE_BUILD_TYPE "Debug")
SET(CMAKE_BUILD_TYPE "Release") SET(CMAKE_BUILD_TYPE "Release")
@@ -433,10 +430,11 @@ IF(INSTALL_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
ENDIF(BUILD_EXTRAS) ENDIF(BUILD_EXTRAS)
SET (LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Library directory name") SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
## the following are directories where stuff will be installed to ## the following are directories where stuff will be installed to
SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/bullet/" CACHE PATH "The subdirectory to the header prefix") SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix")
SET(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
IF(NOT MSVC) IF(NOT MSVC)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY)
INSTALL( INSTALL(
@@ -455,34 +453,19 @@ IF (BUILD_UNIT_TESTS)
SUBDIRS(test) SUBDIRS(test)
ENDIF() ENDIF()
set (BULLET_CONFIG_CMAKE_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/bullet-${BULLET_VERSION}) set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
list (APPEND BULLET_LIBRARIES Bullet::LinearMath) list (APPEND BULLET_LIBRARIES LinearMath)
list (APPEND BULLET_LIBRARIES Bullet::Bullet3Common) list (APPEND BULLET_LIBRARIES Bullet3Common)
list (APPEND BULLET_LIBRARIES Bullet::BulletInverseDynamics) list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
list (APPEND BULLET_LIBRARIES Bullet::BulletCollision) list (APPEND BULLET_LIBRARIES BulletCollision)
list (APPEND BULLET_LIBRARIES Bullet::BulletDynamics) list (APPEND BULLET_LIBRARIES BulletDynamics)
list (APPEND BULLET_LIBRARIES Bullet::BulletSoftBody) list (APPEND BULLET_LIBRARIES BulletSoftBody)
set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake) set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake)
configure_package_config_file( configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
INSTALL_DESTINATION ${BULLET_CONFIG_CMAKE_PATH} @ONLY ESCAPE_QUOTES
) )
install( install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake
FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
DESTINATION ${BULLET_CONFIG_CMAKE_PATH} DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
) )
write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/BulletConfigVersion.cmake
VERSION ${BULLET_VERSION}
COMPATIBILITY ExactVersion
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/BulletConfigVersion.cmake
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
)
install(
EXPORT Bullet
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
NAMESPACE Bullet::
FILE BulletExport.cmake
)

23
Extras/BulletRobotics/CMakeLists.txt
View File

@@ -1,3 +1,12 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/examples
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/enet/include
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/clsocket/src
)
SET(BulletRobotics_SRCS SET(BulletRobotics_SRCS
../../examples/SharedMemory/IKTrajectoryHelper.cpp ../../examples/SharedMemory/IKTrajectoryHelper.cpp
../../examples/SharedMemory/IKTrajectoryHelper.h ../../examples/SharedMemory/IKTrajectoryHelper.h
@@ -149,15 +158,6 @@ ADD_LIBRARY(BulletRobotics ${BulletRobotics_SRCS})
SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletRobotics PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/examples>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/enet/include>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/clsocket/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -176,9 +176,8 @@ IF (INSTALL_EXTRA_LIBS)
) )
INSTALL(TARGETS INSTALL(TARGETS
BulletRobotics BulletRobotics
EXPORT Bullet LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)

20
Extras/ConvexDecomposition/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(ConvexDecomposition_SRCS SET(ConvexDecomposition_SRCS
bestfitobb.cpp bestfitobb.cpp
ConvexBuilder.cpp ConvexBuilder.cpp
@@ -34,13 +38,6 @@ ADD_LIBRARY(ConvexDecomposition ${ConvexDecomposition_SRCS} ${ConvexDecompositio
SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(ConvexDecomposition PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/ConvexDecomposition>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath) TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -50,13 +47,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS ConvexDecomposition EXPORT Bullet DESTINATION .) INSTALL(TARGETS ConvexDecomposition DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS ConvexDecomposition INSTALL(TARGETS ConvexDecomposition
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

25
Extras/GIMPACTUtils/CMakeLists.txt
View File

@@ -1,18 +1,16 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include
${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils
${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
)
ADD_LIBRARY(GIMPACTUtils ADD_LIBRARY(GIMPACTUtils
btGImpactConvexDecompositionShape.cpp btGImpactConvexDecompositionShape.h btGImpactConvexDecompositionShape.cpp btGImpactConvexDecompositionShape.h
) )
SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(GIMPACTUtils PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(GIMPACTUtils PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/GIMPACTUtils>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(GIMPACTUtils ConvexDecomposition BulletCollision) TARGET_LINK_LIBRARIES(GIMPACTUtils ConvexDecomposition BulletCollision)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -22,13 +20,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS GIMPACTUtils EXPORT Bullet DESTINATION .) INSTALL(TARGETS GIMPACTUtils DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS GIMPACTUtils INSTALL(TARGETS GIMPACTUtils
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

18
Extras/HACD/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/HACD
)
SET(HACD_SRCS SET(HACD_SRCS
hacdGraph.cpp hacdGraph.cpp
hacdHACD.cpp hacdHACD.cpp
@@ -21,11 +25,6 @@ ADD_LIBRARY(HACD ${HACD_SRCS} ${HACD_HDRS})
SET_TARGET_PROPERTIES(HACD PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(HACD PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(HACD PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(HACD PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(HACD PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/HACD>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/HACD>
)
#IF (BUILD_SHARED_LIBS) #IF (BUILD_SHARED_LIBS)
# TARGET_LINK_LIBRARIES(HACD BulletCollision LinearMath) # TARGET_LINK_LIBRARIES(HACD BulletCollision LinearMath)
#ENDIF (BUILD_SHARED_LIBS) #ENDIF (BUILD_SHARED_LIBS)
@@ -35,13 +34,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS HACD EXPORT Bullet DESTINATION .) INSTALL(TARGETS HACD DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS HACD INSTALL(TARGETS HACD
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN "*.inl" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN "*.inl" PATTERN

19
Extras/InverseDynamics/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
ADD_LIBRARY( ADD_LIBRARY(
BulletInverseDynamicsUtils BulletInverseDynamicsUtils
CloneTreeCreator.cpp CloneTreeCreator.cpp
@@ -17,12 +21,6 @@ User2InternalIndex.cpp
SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletInverseDynamicsUtils PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/InverseDynamics>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath) TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -32,13 +30,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletInverseDynamicsUtils EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletInverseDynamicsUtils DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletInverseDynamicsUtils INSTALL(TARGETS BulletInverseDynamicsUtils
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

18
Extras/Serialize/BulletFileLoader/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(BulletFileLoader_SRCS SET(BulletFileLoader_SRCS
bChunk.cpp bChunk.cpp
bDNA.cpp bDNA.cpp
@@ -16,11 +20,6 @@ btBulletFile.h
ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS}) ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
target_include_directories(BulletFileLoader PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -33,13 +32,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletFileLoader EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletFileLoader DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletFileLoader INSTALL(TARGETS BulletFileLoader
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL( INSTALL(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN

21
Extras/Serialize/BulletWorldImporter/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
)
ADD_LIBRARY( ADD_LIBRARY(
BulletWorldImporter BulletWorldImporter
btBulletWorldImporter.cpp btBulletWorldImporter.cpp
@@ -9,13 +14,6 @@ btWorldImporter.h
SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletWorldImporter PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/BulletFileLoader>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -25,13 +23,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletWorldImporter EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletWorldImporter DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletWorldImporter INSTALL(TARGETS BulletWorldImporter
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

24
Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
View File

@@ -1,3 +1,9 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
)
ADD_LIBRARY( ADD_LIBRARY(
BulletXmlWorldImporter BulletXmlWorldImporter
btBulletXmlWorldImporter.cpp btBulletXmlWorldImporter.cpp
@@ -15,15 +21,6 @@ ADD_LIBRARY(
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletXmlWorldImporter PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader>
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/BulletFileLoader>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}/BulletWorldImporter>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -33,13 +30,12 @@ IF (INSTALL_EXTRA_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletXmlWorldImporter EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletXmlWorldImporter DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletXmlWorldImporter INSTALL(TARGETS BulletXmlWorldImporter
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN

8
examples/ThirdPartyLibs/clsocket/CMakeLists.txt
View File

@@ -6,6 +6,8 @@
#set(BUILD_MINOR "4") #set(BUILD_MINOR "4")
#set(BUILD_VERSION "3") #set(BUILD_VERSION "3")
include_directories(src)
SET(CLSOCKET_HEADERS SET(CLSOCKET_HEADERS
src/ActiveSocket.h src/ActiveSocket.h
src/Host.h src/Host.h
@@ -61,14 +63,10 @@ else()
endif() endif()
endif() endif()
TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS}) TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS})
target_include_directories(clsocket PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
# install into configured prefix # install into configured prefix
if(NOT CLSOCKET_DEP_ONLY) if(NOT CLSOCKET_DEP_ONLY)
install(TARGETS clsocket EXPORT Bullet ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) install(TARGETS clsocket ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
install(FILES ${CLSOCKET_HEADERS} DESTINATION include) install(FILES ${CLSOCKET_HEADERS} DESTINATION include)
else() else()

18
src/Bullet3Collision/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(Bullet3Collision_SRCS SET(Bullet3Collision_SRCS
BroadPhaseCollision/b3DynamicBvh.cpp BroadPhaseCollision/b3DynamicBvh.cpp
BroadPhaseCollision/b3DynamicBvhBroadphase.cpp BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
@@ -53,10 +58,6 @@ SET(Bullet3Collision_HDRS
) )
ADD_LIBRARY(Bullet3Collision ${Bullet3Collision_SRCS} ${Bullet3Collision_HDRS}) ADD_LIBRARY(Bullet3Collision ${Bullet3Collision_SRCS} ${Bullet3Collision_HDRS})
target_include_directories(Bullet3Collision PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_link_libraries(Bullet3Collision Bullet3Geometry) target_link_libraries(Bullet3Collision Bullet3Geometry)
endif () endif ()
@@ -68,13 +69,12 @@ IF (INSTALL_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Collision EXPORT Bullet DESTINATION .) INSTALL(TARGETS Bullet3Collision DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Collision INSTALL(TARGETS Bullet3Collision
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

18
src/Bullet3Common/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(Bullet3Common_SRCS SET(Bullet3Common_SRCS
b3AlignedAllocator.cpp b3AlignedAllocator.cpp
b3Vector3.cpp b3Vector3.cpp
@@ -30,10 +35,6 @@ SET(Bullet3Common_HDRS
) )
ADD_LIBRARY(Bullet3Common ${Bullet3Common_SRCS} ${Bullet3Common_HDRS}) ADD_LIBRARY(Bullet3Common ${Bullet3Common_SRCS} ${Bullet3Common_HDRS})
target_include_directories(Bullet3Common PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES SOVERSION ${BULLET_VERSION})
@@ -42,13 +43,12 @@ IF (INSTALL_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Common EXPORT Bullet DESTINATION .) INSTALL(TARGETS Bullet3Common DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Common INSTALL(TARGETS Bullet3Common
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

18
src/Bullet3Dynamics/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(Bullet3Dynamics_SRCS SET(Bullet3Dynamics_SRCS
b3CpuRigidBodyPipeline.cpp b3CpuRigidBodyPipeline.cpp
ConstraintSolver/b3FixedConstraint.cpp ConstraintSolver/b3FixedConstraint.cpp
@@ -25,10 +30,6 @@ SET(Bullet3Dynamics_HDRS
) )
ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS}) ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS})
target_include_directories(Bullet3Dynamics PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_link_libraries(Bullet3Dynamics Bullet3Collision) target_link_libraries(Bullet3Dynamics Bullet3Collision)
endif () endif ()
@@ -40,13 +41,12 @@ IF (INSTALL_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Dynamics EXPORT Bullet DESTINATION .) INSTALL(TARGETS Bullet3Dynamics DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Dynamics INSTALL(TARGETS Bullet3Dynamics
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

18
src/Bullet3Geometry/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(Bullet3Geometry_SRCS SET(Bullet3Geometry_SRCS
b3ConvexHullComputer.cpp b3ConvexHullComputer.cpp
b3GeometryUtil.cpp b3GeometryUtil.cpp
@@ -11,10 +16,6 @@ SET(Bullet3Geometry_HDRS
) )
ADD_LIBRARY(Bullet3Geometry ${Bullet3Geometry_SRCS} ${Bullet3Geometry_HDRS}) ADD_LIBRARY(Bullet3Geometry ${Bullet3Geometry_SRCS} ${Bullet3Geometry_HDRS})
target_include_directories(Bullet3Geometry PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_link_libraries(Bullet3Geometry Bullet3Common) target_link_libraries(Bullet3Geometry Bullet3Common)
endif() endif()
@@ -26,13 +27,12 @@ IF (INSTALL_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Geometry EXPORT Bullet DESTINATION .) INSTALL(TARGETS Bullet3Geometry DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Geometry INSTALL(TARGETS Bullet3Geometry
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

14
src/Bullet3OpenCL/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src )
ADD_DEFINITIONS(-DB3_USE_CLEW) ADD_DEFINITIONS(-DB3_USE_CLEW)
SET(Bullet3OpenCL_clew_SRCS SET(Bullet3OpenCL_clew_SRCS
@@ -42,10 +44,6 @@ SET(Bullet3OpenCL_clew_HDRS
ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_HDRS}) ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_HDRS})
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(Bullet3OpenCL_clew PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS})
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -56,11 +54,11 @@ IF (INSTALL_LIBS)
#INSTALL of other files requires CMake 2.6 #INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3OpenCL_clew EXPORT Bullet DESTINATION .) INSTALL(TARGETS Bullet3OpenCL_clew DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3OpenCL_clew EXPORT Bullet RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INSTALL(TARGETS Bullet3OpenCL_clew RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
# INSTALL(FILES ../btBullet3OpenCL_clewCommon.h # INSTALL(FILES ../btBullet3OpenCL_clewCommon.h

18
src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(Bullet2FileLoader_SRCS SET(Bullet2FileLoader_SRCS
b3BulletFile.cpp b3BulletFile.cpp
b3Chunk.cpp b3Chunk.cpp
@@ -19,10 +24,6 @@ SET(Bullet2FileLoader_HDRS
) )
ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS}) ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS})
target_include_directories(Bullet2FileLoader PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_link_libraries(Bullet2FileLoader Bullet3Common) target_link_libraries(Bullet2FileLoader Bullet3Common)
endif () endif ()
@@ -34,13 +35,12 @@ IF (INSTALL_LIBS)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet2FileLoader EXPORT Bullet DESTINATION .) INSTALL(TARGETS Bullet2FileLoader DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet2FileLoader INSTALL(TARGETS Bullet2FileLoader
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

14
src/BulletCollision/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src )
SET(BulletCollision_SRCS SET(BulletCollision_SRCS
BroadphaseCollision/btAxisSweep3.cpp BroadphaseCollision/btAxisSweep3.cpp
BroadphaseCollision/btBroadphaseProxy.cpp BroadphaseCollision/btBroadphaseProxy.cpp
@@ -252,10 +254,6 @@ SET(BulletCollision_HDRS
ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS}) ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletCollision PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletCollision LinearMath) TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -266,11 +264,11 @@ IF (INSTALL_LIBS)
#INSTALL of other files requires CMake 2.6 #INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletCollision EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletCollision DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletCollision EXPORT Bullet RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INSTALL(TARGETS BulletCollision RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
INSTALL(FILES ../btBulletCollisionCommon.h INSTALL(FILES ../btBulletCollisionCommon.h

16
src/BulletDynamics/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src )
SET(BulletDynamics_SRCS SET(BulletDynamics_SRCS
Character/btKinematicCharacterController.cpp Character/btKinematicCharacterController.cpp
ConstraintSolver/btConeTwistConstraint.cpp ConstraintSolver/btConeTwistConstraint.cpp
@@ -130,10 +134,6 @@ SET(BulletDynamics_HDRS
ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS}) ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS})
SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletDynamics PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath) TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -142,11 +142,11 @@ IF (INSTALL_LIBS)
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletDynamics EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletDynamics DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletDynamics EXPORT Bullet RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INSTALL(TARGETS BulletDynamics RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

14
src/BulletInverseDynamics/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src )
SET(BulletInverseDynamics_SRCS SET(BulletInverseDynamics_SRCS
IDMath.cpp IDMath.cpp
MultiBodyTree.cpp MultiBodyTree.cpp
@@ -30,10 +32,6 @@ SET(BulletInverseDynamics_HDRS
ADD_LIBRARY(BulletInverseDynamics ${BulletInverseDynamics_SRCS} ${BulletInverseDynamics_HDRS}) ADD_LIBRARY(BulletInverseDynamics ${BulletInverseDynamics_SRCS} ${BulletInverseDynamics_HDRS})
SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletInverseDynamics PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletInverseDynamics Bullet3Common LinearMath) TARGET_LINK_LIBRARIES(BulletInverseDynamics Bullet3Common LinearMath)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -44,11 +42,11 @@ IF (INSTALL_LIBS)
#INSTALL of other files requires CMake 2.6 #INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletInverseDynamics EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletInverseDynamics DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletInverseDynamics EXPORT Bullet RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INSTALL(TARGETS BulletInverseDynamics RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
INSTALL(FILES ../btBulletCollisionCommon.h INSTALL(FILES ../btBulletCollisionCommon.h

18
src/BulletSoftBody/CMakeLists.txt
View File

@@ -1,3 +1,9 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
#SUBDIRS( Solvers ) #SUBDIRS( Solvers )
SET(BulletSoftBody_SRCS SET(BulletSoftBody_SRCS
@@ -36,10 +42,6 @@ SET(BulletSoftBody_HDRS
ADD_LIBRARY(BulletSoftBody ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS}) ADD_LIBRARY(BulletSoftBody ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS})
SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(BulletSoftBody PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics) TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics)
ENDIF (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS)
@@ -48,11 +50,11 @@ IF (INSTALL_LIBS)
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletSoftBody EXPORT Bullet DESTINATION .) INSTALL(TARGETS BulletSoftBody DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletSoftBody EXPORT Bullet RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INSTALL(TARGETS BulletSoftBody RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)

18
src/LinearMath/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(LinearMath_SRCS SET(LinearMath_SRCS
btAlignedAllocator.cpp btAlignedAllocator.cpp
btConvexHull.cpp btConvexHull.cpp
@@ -44,23 +49,18 @@ SET(LinearMath_HDRS
ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS}) ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS})
SET_TARGET_PROPERTIES(LinearMath PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(LinearMath PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(LinearMath PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(LinearMath PROPERTIES SOVERSION ${BULLET_VERSION})
target_include_directories(LinearMath PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
IF (INSTALL_LIBS) IF (INSTALL_LIBS)
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
#FILES_MATCHING requires CMake 2.6 #FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS LinearMath EXPORT Bullet DESTINATION .) INSTALL(TARGETS LinearMath DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS LinearMath INSTALL(TARGETS LinearMath
EXPORT Bullet RUNTIME DESTINATION bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)