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

fix whitespace formatting in cmake files

Browse Source
This commit is contained in:
Andrew Meadows
2015-12-07 14:08:04 -08:00
parent aaf4e1acfa
commit c0c1691c25
29 changed files with 241 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
CMakeLists.txt
View File

@@ -15,7 +15,7 @@ ENDIF(COMMAND cmake_policy)
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")
ENDIF (NOT CMAKE_BUILD_TYPE) ENDIF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
#MESSAGE("CMAKE_CXX_FLAGS_DEBUG="+${CMAKE_CXX_FLAGS_DEBUG}) #MESSAGE("CMAKE_CXX_FLAGS_DEBUG="+${CMAKE_CXX_FLAGS_DEBUG})
@@ -34,8 +34,8 @@ ELSE ()
OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)" OFF) OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)" OFF)
ENDIF (CMAKE_SYSTEM_NAME STREQUAL WindowsPhone OR CMAKE_SYSTEM_NAME STREQUAL WindowsStore) ENDIF (CMAKE_SYSTEM_NAME STREQUAL WindowsPhone OR CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
#SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO") #SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO")
#SET(CMAKE_EXE_LINKER_FLAGS "/STACK:10000000 /INCREMENTAL:NO") #SET(CMAKE_EXE_LINKER_FLAGS "/STACK:10000000 /INCREMENTAL:NO")
#MESSAGE("MSVC_INCREMENTAL_YES_FLAG"+${MSVC_INCREMENTAL_YES_FLAG}) #MESSAGE("MSVC_INCREMENTAL_YES_FLAG"+${MSVC_INCREMENTAL_YES_FLAG})
@@ -44,23 +44,23 @@ IF(MSVC)
IF (NOT USE_MSVC_INCREMENTAL_LINKING) IF (NOT USE_MSVC_INCREMENTAL_LINKING)
#MESSAGE("MSVC_INCREMENTAL_DEFAULT"+${MSVC_INCREMENTAL_DEFAULT}) #MESSAGE("MSVC_INCREMENTAL_DEFAULT"+${MSVC_INCREMENTAL_DEFAULT})
SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:NO") SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:NO")
STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_DEBUG}) STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_DEBUG})
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO ${replacementFlags}" ) SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO ${replacementFlags}" )
MESSAGE("CMAKE_EXE_LINKER_FLAGS_DEBUG=${CMAKE_EXE_LINKER_FLAGS_DEBUG}") MESSAGE("CMAKE_EXE_LINKER_FLAGS_DEBUG=${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags2 ${CMAKE_EXE_LINKER_FLAGS})
SET(CMAKE_EXE_LINKER_FLAGS ${replacementFlag2})
STRING(REPLACE "INCREMENTAL:YES" "" replacementFlags3 "${CMAKE_EXTRA_LINK_FLAGS}")
SET(CMAKE_EXTRA_LINK_FLAGS ${replacementFlag3}) STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags2 ${CMAKE_EXE_LINKER_FLAGS})
SET(CMAKE_EXE_LINKER_FLAGS ${replacementFlag2})
STRING(REPLACE "INCREMENTAL:YES" "" replacementFlags3 "${CMAKE_EXTRA_LINK_FLAGS}")
SET(CMAKE_EXTRA_LINK_FLAGS ${replacementFlag3})
STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3})
SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags3}" ) SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags3}" )
ENDIF (NOT USE_MSVC_INCREMENTAL_LINKING) ENDIF (NOT USE_MSVC_INCREMENTAL_LINKING)
IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL) IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
@@ -126,7 +126,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
ENDIF (WIN32) ENDIF (WIN32)
OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON) OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON)
@@ -151,8 +151,8 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
IF (USE_GLUT AND MSVC) IF (USE_GLUT AND MSVC)
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
remove_definitions(-D_WINDOWS ) remove_definitions(-D_WINDOWS )
ENDIF() ENDIF()
@@ -161,11 +161,11 @@ ELSE(WIN32)
OPTION(USE_GLUT "Use Glut" ON) OPTION(USE_GLUT "Use Glut" ON)
ENDIF(WIN32) ENDIF(WIN32)
IF(COMMAND cmake_policy) IF(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
ENDIF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy)
# This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system # This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system
# This should be the case. # This should be the case.
@@ -194,18 +194,18 @@ OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON)
IF(BUILD_BULLET3) IF(BUILD_BULLET3)
IF(APPLE) IF(APPLE)
MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}") MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}")
IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9) IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9)
MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option") MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option")
#unset(BUILD_OPENGL3_DEMOS CACHE) #unset(BUILD_OPENGL3_DEMOS CACHE)
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF)
ELSE() ELSE()
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON)
ENDIF() ENDIF()
ELSE() ELSE()
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON)
ENDIF() ENDIF()
ELSE(BUILD_BULLET3) ELSE(BUILD_BULLET3)
unset(BUILD_OPENGL3_DEMOS CACHE) unset(BUILD_OPENGL3_DEMOS CACHE)
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" OFF) OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" OFF)
@@ -221,9 +221,9 @@ ENDIF(BUILD_OPENGL3_DEMOS)
OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON) OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON)
IF(BUILD_BULLET2_DEMOS) IF(BUILD_BULLET2_DEMOS)
IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples) IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples)
SUBDIRS(examples) SUBDIRS(examples)
ENDIF() ENDIF()
ENDIF(BUILD_BULLET2_DEMOS) ENDIF(BUILD_BULLET2_DEMOS)
@@ -253,15 +253,15 @@ IF(INSTALL_LIBS)
SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name") 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 "include/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 "lib${LIB_SUFFIX}/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(
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/bullet.pc ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc
DESTINATION DESTINATION
${PKGCONFIG_INSTALL_PREFIX}) ${PKGCONFIG_INSTALL_PREFIX})
ENDIF(NOT MSVC) ENDIF(NOT MSVC)
ENDIF(INSTALL_LIBS) ENDIF(INSTALL_LIBS)
@@ -284,11 +284,11 @@ list (APPEND BULLET_LIBRARIES BulletCollision)
list (APPEND BULLET_LIBRARIES BulletDynamics) list (APPEND BULLET_LIBRARIES BulletDynamics)
list (APPEND BULLET_LIBRARIES 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_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
@ONLY ESCAPE_QUOTES @ONLY ESCAPE_QUOTES
) )
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake install ( 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}
) )

2
Extras/HACD/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ SET(HACD_HDRS
hacdVector.h hacdVector.h
hacdVersion.h hacdVersion.h
hacdCircularList.inl hacdCircularList.inl
hacdVector.inl hacdVector.inl
) )
ADD_LIBRARY(HACD ${HACD_SRCS} ${HACD_HDRS}) ADD_LIBRARY(HACD ${HACD_SRCS} ${HACD_HDRS})

4
Extras/InverseDynamics/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )
@@ -20,7 +20,7 @@ SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VER
SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION})
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)
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)

2
Extras/Serialize/BlenderSerialize/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BlenderSerialize ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BlenderSerialize

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

@@ -1,5 +1,5 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )
SET(BulletFileLoader_SRCS SET(BulletFileLoader_SRCS
@@ -21,29 +21,30 @@ btBulletFile.h
ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS}) ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
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)
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_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 BulletFileLoader DESTINATION .) INSTALL(TARGETS BulletFileLoader DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX}) INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} INSTALL(
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF (APPLE AND 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 BUILD_SHARED_LIBS AND FRAMEWORK)
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}") SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ENDIF (INSTALL_EXTRA_LIBS) ENDIF (INSTALL_EXTRA_LIBS)

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

@@ -1,21 +1,21 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
) )
ADD_LIBRARY( ADD_LIBRARY(
BulletWorldImporter BulletWorldImporter
btBulletWorldImporter.cpp btBulletWorldImporter.cpp
btBulletWorldImporter.h btBulletWorldImporter.h
btWorldImporter.cpp btWorldImporter.cpp
btWorldImporter.h 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})
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)
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)

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

@@ -1,13 +1,13 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
) )
ADD_LIBRARY( ADD_LIBRARY(
BulletXmlWorldImporter BulletXmlWorldImporter
btBulletXmlWorldImporter.cpp btBulletXmlWorldImporter.cpp
btBulletXmlWorldImporter.h btBulletXmlWorldImporter.h
string_split.cpp string_split.cpp
string_split.h string_split.h
tinyxml.cpp tinyxml.cpp
@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
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)
IF (INSTALL_EXTRA_LIBS) IF (INSTALL_EXTRA_LIBS)

4
Extras/Serialize/HeaderGenerator/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ FILE(GLOB cpp_SRC "*.cpp")
FILE(GLOB h_SRC "*.h") FILE(GLOB h_SRC "*.h")
SET(includes SET(includes
. .
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BlenderSerialize ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BlenderSerialize
@@ -24,7 +24,7 @@ ADD_EXECUTABLE(HeaderGenerator ${cpp_SRC} ${h_SRC})
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET HeaderGenerator TARGET HeaderGenerator
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/HeaderGenerator/createDnaString.bat ${CMAKE_CURRENT_BINARY_DIR}/createDnaString.bat COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/HeaderGenerator/createDnaString.bat ${CMAKE_CURRENT_BINARY_DIR}/createDnaString.bat
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/HeaderGenerator/bulletGenerate.py ${CMAKE_CURRENT_BINARY_DIR}/bulletGenerate.py COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/HeaderGenerator/bulletGenerate.py ${CMAKE_CURRENT_BINARY_DIR}/bulletGenerate.py

6
Extras/Serialize/ReadBulletSample/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )
LINK_LIBRARIES( LINK_LIBRARIES(
@@ -21,7 +21,7 @@ SET(READBULLET_SRC
) )
ADD_EXECUTABLE(AppReadBulletSample ADD_EXECUTABLE(AppReadBulletSample
${READBULLET_SRC} ${READBULLET_SRC}
${ADDITIONAL_SRC} ${ADDITIONAL_SRC}
) )
@@ -30,4 +30,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES DEBUG_POSTFIX "_Debug") SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES DEBUG_POSTFIX "_Debug")
SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel")
SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

4
Extras/Serialize/makesdna/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.4) cmake_minimum_required(VERSION 2.4)
IF(COMMAND cmake_policy) IF(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
ENDIF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy)
@@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/src )
SET (INC_FILES SET (INC_FILES
DNA_rigidbody.h DNA_rigidbody.h
${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btVector3.h ${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btVector3.h
${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btMatrix3x3.h ${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btMatrix3x3.h
${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btTransform.h ${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btTransform.h

8
examples/BasicDemo/CMakeLists.txt
View File

@@ -1,16 +1,16 @@
# App_BasicExample is a minimal sample creating, stepping and deleting a Bullet dynamics world # App_BasicExample is a minimal sample creating, stepping and deleting a Bullet dynamics world
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )
LINK_LIBRARIES( LINK_LIBRARIES(
BulletDynamics BulletCollision LinearMath BulletDynamics BulletCollision LinearMath
) )
IF (WIN32) IF (WIN32)
ADD_EXECUTABLE(App_BasicExample ADD_EXECUTABLE(App_BasicExample
BasicExample.cpp BasicExample.cpp
main.cpp main.cpp
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
) )
@@ -28,4 +28,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES DEBUG_POSTFIX "_Debug") SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES DEBUG_POSTFIX "_Debug")
SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel")
SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

82
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -2,7 +2,7 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
) )
@@ -68,14 +68,14 @@ SET(App_ExampleBrowser_SRCS
../DynamicControlDemo/MotorDemo.cpp ../DynamicControlDemo/MotorDemo.cpp
../DynamicControlDemo/MotorDemo.h ../DynamicControlDemo/MotorDemo.h
../MultiThreading/MultiThreadingExample.cpp ../MultiThreading/MultiThreadingExample.cpp
../MultiThreading/b3PosixThreadSupport.cpp ../MultiThreading/b3PosixThreadSupport.cpp
../MultiThreading/b3Win32ThreadSupport.cpp ../MultiThreading/b3Win32ThreadSupport.cpp
../MultiThreading/b3ThreadSupportInterface.cpp ../MultiThreading/b3ThreadSupportInterface.cpp
../RenderingExamples/TimeSeriesCanvas.cpp ../RenderingExamples/TimeSeriesCanvas.cpp
../RenderingExamples/TimeSeriesCanvas.h ../RenderingExamples/TimeSeriesCanvas.h
../RenderingExamples/TimeSeriesFontData.cpp ../RenderingExamples/TimeSeriesFontData.cpp
../RenderingExamples/TimeSeriesFontData.h ../RenderingExamples/TimeSeriesFontData.h
../RenderingExamples/CoordinateSystemDemo.cpp ../RenderingExamples/CoordinateSystemDemo.cpp
../RenderingExamples/CoordinateSystemDemo.h ../RenderingExamples/CoordinateSystemDemo.h
../RenderingExamples/RaytracerSetup.cpp ../RenderingExamples/RaytracerSetup.cpp
@@ -90,7 +90,7 @@ SET(App_ExampleBrowser_SRCS
../Raycast/RaytestDemo.cpp ../Raycast/RaytestDemo.cpp
../Importers/ImportBsp/BspConverter.h ../Importers/ImportBsp/BspConverter.h
../Importers/ImportBullet/SerializeSetup.cpp ../Importers/ImportBullet/SerializeSetup.cpp
../Importers/ImportBullet/SerializeSetup.h ../Importers/ImportBullet/SerializeSetup.h
../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp ../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp
../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp ../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
@@ -151,38 +151,38 @@ SET(App_ExampleBrowser_SRCS
../Constraints/Dof6Spring2Setup.h ../Constraints/Dof6Spring2Setup.h
../Constraints/ConstraintPhysicsSetup.cpp ../Constraints/ConstraintPhysicsSetup.cpp
../Constraints/ConstraintPhysicsSetup.h ../Constraints/ConstraintPhysicsSetup.h
../ThirdPartyLibs/stb_image/stb_image.cpp ../ThirdPartyLibs/stb_image/stb_image.cpp
../ThirdPartyLibs/stb_image/stb_image.h ../ThirdPartyLibs/stb_image/stb_image.h
../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp ../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
../ThirdPartyLibs/tinyxml/tinystr.cpp ../ThirdPartyLibs/tinyxml/tinystr.cpp
../ThirdPartyLibs/tinyxml/tinyxml.cpp ../ThirdPartyLibs/tinyxml/tinyxml.cpp
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h
../ThirdPartyLibs/tinyxml/tinystr.cpp ../ThirdPartyLibs/tinyxml/tinystr.cpp
../ThirdPartyLibs/tinyxml/tinyxml.cpp ../ThirdPartyLibs/tinyxml/tinyxml.cpp
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h ../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h
../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h ../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h
../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp ../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp
../ThirdPartyLibs/urdf/boost_replacement/printf_console.h ../ThirdPartyLibs/urdf/boost_replacement/printf_console.h
../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp ../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp
../ThirdPartyLibs/urdf/boost_replacement/string_split.h ../ThirdPartyLibs/urdf/boost_replacement/string_split.h
../Utils/b3Clock.cpp ../Utils/b3Clock.cpp
../Utils/b3Clock.h ../Utils/b3Clock.h
../Utils/b3ResourcePath.cpp ../Utils/b3ResourcePath.cpp
@@ -193,7 +193,7 @@ SET(App_ExampleBrowser_SRCS
) )
LINK_LIBRARIES( LINK_LIBRARIES(
Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
IF (WIN32) IF (WIN32)
@@ -204,27 +204,25 @@ IF (WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
ELSE(WIN32) ELSE(WIN32)
IF(APPLE) IF(APPLE)
find_library(COCOA NAMES Cocoa) find_library(COCOA NAMES Cocoa)
MESSAGE(${COCOA}) MESSAGE(${COCOA})
link_libraries(${COCOA}) link_libraries(${COCOA})
ELSE(APPLE) ELSE(APPLE)
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew )
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
)
LINK_LIBRARIES( pthread dl) LINK_LIBRARIES( pthread dl)
ENDIF(APPLE) ENDIF(APPLE)
ENDIF(WIN32) ENDIF(WIN32)
ADD_EXECUTABLE(App_ExampleBrowser ADD_EXECUTABLE(App_ExampleBrowser
${App_ExampleBrowser_SRCS} ${App_ExampleBrowser_SRCS}
) )
IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(App_ExampleBrowser PROPERTIES DEBUG_POSTFIX "_Debug") SET_TARGET_PROPERTIES(App_ExampleBrowser PROPERTIES DEBUG_POSTFIX "_Debug")

10
examples/HelloWorld/CMakeLists.txt
View File

@@ -1,21 +1,21 @@
# HelloWorld is a minimal sample creating, stepping and deleting a Bullet dynamics world # HelloWorld is a minimal sample creating, stepping and deleting a Bullet dynamics world
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )
LINK_LIBRARIES( LINK_LIBRARIES(
BulletDynamics BulletCollision LinearMath BulletDynamics BulletCollision LinearMath
) )
IF (WIN32) IF (WIN32)
ADD_EXECUTABLE(App_HelloWorld ADD_EXECUTABLE(App_HelloWorld
HelloWorld.cpp HelloWorld.cpp
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
) )
ELSE() ELSE()
ADD_EXECUTABLE(App_HelloWorld ADD_EXECUTABLE(App_HelloWorld
HelloWorld.cpp HelloWorld.cpp
) )
ENDIF() ENDIF()
@@ -26,4 +26,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES DEBUG_POSTFIX "_Debug") SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES DEBUG_POSTFIX "_Debug")
SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel")
SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

10
examples/OpenGLWindow/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ LIST(REMOVE_ITEM OpenGLWindowCommon_CPP X11OpenGLWindow.cpp )
#MESSAGE (${OpenGLWindowCommon_CPP}) #MESSAGE (${OpenGLWindowCommon_CPP})
IF (WIN32) IF (WIN32)
SET(OpenGLWindow_SRCS ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowWin32_CPP} ${OpenGLWindowCommon_CPP}) SET(OpenGLWindow_SRCS ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowWin32_CPP} ${OpenGLWindowCommon_CPP})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
) )
@@ -34,10 +34,10 @@ ENDIF(APPLE)
IF(NOT WIN32 AND NOT APPLE) IF(NOT WIN32 AND NOT APPLE)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
) )
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowCommon_CPP} ) SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowCommon_CPP} )
ENDIF() ENDIF()
@@ -57,7 +57,7 @@ if (BUILD_SHARED_LIBS)
target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY}) target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY})
else() else()
set (CMAKE_THREAD_PREFER_PTHREAD TRUE) set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
FIND_PACKAGE(Threads) FIND_PACKAGE(Threads)
target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT})
endif() endif()
endif() endif()

24
examples/SimpleOpenGL3/CMakeLists.txt
View File

@@ -1,20 +1,20 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/btgui ${BULLET_PHYSICS_SOURCE_DIR}/btgui
${BULLET_PHYSICS_SOURCE_DIR}/examples ${BULLET_PHYSICS_SOURCE_DIR}/examples
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
) )
SET(AppSimpleOpenGL3_SRCS SET(AppSimpleOpenGL3_SRCS
main.cpp main.cpp
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
) )
LINK_LIBRARIES( LINK_LIBRARIES(
gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
IF (WIN32) IF (WIN32)
@@ -28,14 +28,14 @@ ELSE(WIN32)
find_library(COCOA NAMES Cocoa) find_library(COCOA NAMES Cocoa)
MESSAGE(${COCOA}) MESSAGE(${COCOA})
link_libraries(${COCOA}) link_libraries(${COCOA})
ELSE(APPLE)
INCLUDE_DIRECTORIES( ELSE(APPLE)
${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows INCLUDE_DIRECTORIES(
) ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") )
ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
LINK_LIBRARIES( X11 pthread dl Xext) LINK_LIBRARIES( X11 pthread dl Xext)
ENDIF(APPLE) ENDIF(APPLE)
@@ -45,7 +45,7 @@ ENDIF(WIN32)
ADD_EXECUTABLE(AppSimpleOpenGL3 ADD_EXECUTABLE(AppSimpleOpenGL3
${AppSimpleOpenGL3_SRCS} ${AppSimpleOpenGL3_SRCS}
) )
IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(AppSimpleOpenGL3 PROPERTIES DEBUG_POSTFIX "_Debug") SET_TARGET_PROPERTIES(AppSimpleOpenGL3 PROPERTIES DEBUG_POSTFIX "_Debug")

2
examples/ThirdPartyLibs/lua-5.2.3/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
src src
) )

12
src/Bullet3Collision/CMakeLists.txt
View File

@@ -4,11 +4,11 @@ INCLUDE_DIRECTORIES(
) )
SET(Bullet3Collision_SRCS SET(Bullet3Collision_SRCS
BroadPhaseCollision/b3DynamicBvh.cpp BroadPhaseCollision/b3DynamicBvh.cpp
BroadPhaseCollision/b3DynamicBvhBroadphase.cpp BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
BroadPhaseCollision/b3OverlappingPairCache.cpp BroadPhaseCollision/b3OverlappingPairCache.cpp
NarrowPhaseCollision/b3ConvexUtility.cpp NarrowPhaseCollision/b3ConvexUtility.cpp
NarrowPhaseCollision/b3CpuNarrowPhase.cpp NarrowPhaseCollision/b3CpuNarrowPhase.cpp
) )
SET(Bullet3CollisionBroadPhase_HDRS SET(Bullet3CollisionBroadPhase_HDRS
@@ -71,7 +71,7 @@ IF (INSTALL_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Collision 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
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}) ARCHIVE DESTINATION lib${LIB_SUFFIX})

2
src/Bullet3Common/CMakeLists.txt
View File

@@ -45,7 +45,7 @@ IF (INSTALL_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Common 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
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}) ARCHIVE DESTINATION lib${LIB_SUFFIX})

28
src/Bullet3Dynamics/CMakeLists.txt
View File

@@ -14,19 +14,19 @@ SET(Bullet3Dynamics_SRCS
SET(Bullet3Dynamics_HDRS SET(Bullet3Dynamics_HDRS
b3CpuRigidBodyPipeline.h b3CpuRigidBodyPipeline.h
ConstraintSolver/b3ContactSolverInfo.h ConstraintSolver/b3ContactSolverInfo.h
ConstraintSolver/b3FixedConstraint.h ConstraintSolver/b3FixedConstraint.h
ConstraintSolver/b3Generic6DofConstraint.h ConstraintSolver/b3Generic6DofConstraint.h
ConstraintSolver/b3JacobianEntry.h ConstraintSolver/b3JacobianEntry.h
ConstraintSolver/b3PgsJacobiSolver.h ConstraintSolver/b3PgsJacobiSolver.h
ConstraintSolver/b3Point2PointConstraint.h ConstraintSolver/b3Point2PointConstraint.h
ConstraintSolver/b3SolverBody.h ConstraintSolver/b3SolverBody.h
ConstraintSolver/b3SolverConstraint.h ConstraintSolver/b3SolverConstraint.h
ConstraintSolver/b3TypedConstraint.h ConstraintSolver/b3TypedConstraint.h
shared/b3ContactConstraint4.h shared/b3ContactConstraint4.h
shared/b3ConvertConstraint4.h shared/b3ConvertConstraint4.h
shared/b3Inertia.h shared/b3Inertia.h
shared/b3IntegrateTransforms.h shared/b3IntegrateTransforms.h
) )
ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS}) ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS})
@@ -43,7 +43,7 @@ IF (INSTALL_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Dynamics 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
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}) ARCHIVE DESTINATION lib${LIB_SUFFIX})

2
src/Bullet3Geometry/CMakeLists.txt
View File

@@ -29,7 +29,7 @@ IF (INSTALL_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Geometry 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
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}) ARCHIVE DESTINATION lib${LIB_SUFFIX})

62
src/Bullet3OpenCL/CMakeLists.txt
View File

@@ -3,36 +3,36 @@ 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
../clew/clew.c ../clew/clew.c
BroadphaseCollision/b3GpuGridBroadphase.cpp BroadphaseCollision/b3GpuGridBroadphase.cpp
BroadphaseCollision/b3GpuSapBroadphase.cpp BroadphaseCollision/b3GpuSapBroadphase.cpp
BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp
BroadphaseCollision/b3GpuParallelLinearBvh.cpp BroadphaseCollision/b3GpuParallelLinearBvh.cpp
Initialize/b3OpenCLUtils.cpp Initialize/b3OpenCLUtils.cpp
NarrowphaseCollision/b3ContactCache.cpp NarrowphaseCollision/b3ContactCache.cpp
NarrowphaseCollision/b3ConvexHullContact.cpp NarrowphaseCollision/b3ConvexHullContact.cpp
NarrowphaseCollision/b3GjkEpa.cpp NarrowphaseCollision/b3GjkEpa.cpp
NarrowphaseCollision/b3GjkPairDetector.cpp NarrowphaseCollision/b3GjkPairDetector.cpp
NarrowphaseCollision/b3OptimizedBvh.cpp NarrowphaseCollision/b3OptimizedBvh.cpp
NarrowphaseCollision/b3QuantizedBvh.cpp NarrowphaseCollision/b3QuantizedBvh.cpp
NarrowphaseCollision/b3StridingMeshInterface.cpp NarrowphaseCollision/b3StridingMeshInterface.cpp
NarrowphaseCollision/b3TriangleCallback.cpp NarrowphaseCollision/b3TriangleCallback.cpp
NarrowphaseCollision/b3TriangleIndexVertexArray.cpp NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
NarrowphaseCollision/b3VoronoiSimplexSolver.cpp NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
ParallelPrimitives/b3BoundSearchCL.cpp ParallelPrimitives/b3BoundSearchCL.cpp
ParallelPrimitives/b3FillCL.cpp ParallelPrimitives/b3FillCL.cpp
ParallelPrimitives/b3LauncherCL.cpp ParallelPrimitives/b3LauncherCL.cpp
ParallelPrimitives/b3PrefixScanCL.cpp ParallelPrimitives/b3PrefixScanCL.cpp
ParallelPrimitives/b3PrefixScanFloat4CL.cpp ParallelPrimitives/b3PrefixScanFloat4CL.cpp
ParallelPrimitives/b3RadixSort32CL.cpp ParallelPrimitives/b3RadixSort32CL.cpp
Raycast/b3GpuRaycast.cpp Raycast/b3GpuRaycast.cpp
RigidBody/b3GpuGenericConstraint.cpp RigidBody/b3GpuGenericConstraint.cpp
RigidBody/b3GpuJacobiContactSolver.cpp RigidBody/b3GpuJacobiContactSolver.cpp
RigidBody/b3GpuNarrowPhase.cpp RigidBody/b3GpuNarrowPhase.cpp
RigidBody/b3GpuPgsConstraintSolver.cpp RigidBody/b3GpuPgsConstraintSolver.cpp
RigidBody/b3GpuPgsContactSolver.cpp RigidBody/b3GpuPgsContactSolver.cpp
RigidBody/b3GpuRigidBodyPipeline.cpp RigidBody/b3GpuRigidBodyPipeline.cpp
RigidBody/b3Solver.cpp RigidBody/b3Solver.cpp
) )
@@ -65,14 +65,14 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E
#DESTINATION ${INCLUDE_INSTALL_DIR}/Bullet3OpenCL_clew) #DESTINATION ${INCLUDE_INSTALL_DIR}/Bullet3OpenCL_clew)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF (${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)
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES PUBLIC_HEADER "${Root_HDRS}") SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
# Have to list out sub-directories manually: # Have to list out sub-directories manually:
SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ENDIF (INSTALL_LIBS) ENDIF (INSTALL_LIBS)

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

@@ -4,23 +4,23 @@ INCLUDE_DIRECTORIES(
) )
SET(Bullet2FileLoader_SRCS SET(Bullet2FileLoader_SRCS
b3BulletFile.cpp b3BulletFile.cpp
b3Chunk.cpp b3Chunk.cpp
b3DNA.cpp b3DNA.cpp
b3File.cpp b3File.cpp
b3Serializer.cpp b3Serializer.cpp
) )
SET(Bullet2FileLoader_HDRS SET(Bullet2FileLoader_HDRS
b3BulletFile.h b3BulletFile.h
b3Chunk.h b3Chunk.h
b3Common.h b3Common.h
b3Defines.h b3Defines.h
b3DNA.h b3DNA.h
b3File.h b3File.h
b3Serializer.h b3Serializer.h
autogenerated/bullet2.h autogenerated/bullet2.h
) )
ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS}) ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS})
@@ -37,7 +37,7 @@ IF (INSTALL_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet2FileLoader 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
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}) ARCHIVE DESTINATION lib${LIB_SUFFIX})

6
src/BulletCollision/CMakeLists.txt
View File

@@ -271,10 +271,10 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E
DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision) DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF (${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)
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}") SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
# Have to list out sub-directories manually: # Have to list out sub-directories manually:
SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
@@ -282,7 +282,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision)
SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes) SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact) SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision) SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ENDIF (INSTALL_LIBS) ENDIF (INSTALL_LIBS)

2
src/BulletDynamics/CMakeLists.txt
View File

@@ -98,7 +98,7 @@ SET(MLCPSolvers_HDRS
MLCPSolvers/btMLCPSolver.h MLCPSolvers/btMLCPSolver.h
MLCPSolvers/btMLCPSolverInterface.h MLCPSolvers/btMLCPSolverInterface.h
MLCPSolvers/btPATHSolver.h MLCPSolvers/btPATHSolver.h
MLCPSolvers/btSolveProjectedGaussSeidel.h MLCPSolvers/btSolveProjectedGaussSeidel.h
MLCPSolvers/btLemkeSolver.h MLCPSolvers/btLemkeSolver.h
MLCPSolvers/btLemkeAlgorithm.h MLCPSolvers/btLemkeAlgorithm.h
) )

6
src/BulletInverseDynamics/CMakeLists.txt
View File

@@ -53,14 +53,14 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E
DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics) DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF (${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)
SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES FRAMEWORK true)
SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES PUBLIC_HEADER "${BulletInverseDynamicsRoot_HDRS}") SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES PUBLIC_HEADER "${BulletInverseDynamicsRoot_HDRS}")
# Have to list out sub-directories manually: # Have to list out sub-directories manually:
SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details) SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ENDIF (INSTALL_LIBS) ENDIF (INSTALL_LIBS)

2
src/BulletSoftBody/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )
#SUBDIRS( Solvers ) #SUBDIRS( Solvers )

2
src/LinearMath/CMakeLists.txt
View File

@@ -54,7 +54,7 @@ IF (INSTALL_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS LinearMath 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
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}) ARCHIVE DESTINATION lib${LIB_SUFFIX})

8
test/InverseDynamics/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
../../src ../../src
@@ -15,8 +15,8 @@ ADD_DEFINITIONS(-D_VARIADIC_MAX=10)
LINK_LIBRARIES( LINK_LIBRARIES(
BulletInverseDynamicsUtils BulletInverseDynamics Bullet3Common LinearMath gtest BulletInverseDynamicsUtils BulletInverseDynamics Bullet3Common LinearMath gtest
) )
IF (NOT WIN32) IF (NOT WIN32)
LINK_LIBRARIES( pthread ) LINK_LIBRARIES( pthread )
ENDIF() ENDIF()

6
test/collision/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
../../src ../../src
@@ -13,8 +13,8 @@ LINK_LIBRARIES(
LinearMath gtest LinearMath gtest
) )
IF (NOT WIN32) IF (NOT WIN32)
LINK_LIBRARIES( pthread ) LINK_LIBRARIES( pthread )
ENDIF() ENDIF()
ADD_EXECUTABLE(Test_Collision ADD_EXECUTABLE(Test_Collision