From bcefdba59bc45f232fabf4d89eb05a3ac698b538 Mon Sep 17 00:00:00 2001 From: Nico Kruithof Date: Thu, 15 Oct 2015 20:23:12 +0200 Subject: [PATCH 1/9] Fixed missing include directories --- examples/SimpleOpenGL3/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/SimpleOpenGL3/CMakeLists.txt b/examples/SimpleOpenGL3/CMakeLists.txt index 7931eee85..beb8aa17e 100644 --- a/examples/SimpleOpenGL3/CMakeLists.txt +++ b/examples/SimpleOpenGL3/CMakeLists.txt @@ -3,6 +3,8 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/btgui + ${BULLET_PHYSICS_SOURCE_DIR}/examples + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) From f385bffffbdd1554e073f4f6b36440e4cfe70d61 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 3 Dec 2015 18:58:10 -0800 Subject: [PATCH 2/9] cleanup main premake script added premake options: --no-demos --no-test --no-bullet3 --- build3/premake4.lua | 200 ++++++++++++++++++++++++++------------------ 1 file changed, 119 insertions(+), 81 deletions(-) diff --git a/build3/premake4.lua b/build3/premake4.lua index 569aeda48..3fb80e839 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -1,11 +1,11 @@ - solution "0_Bullet3Solution" + solution "0_Bullet3Solution" local osversion = os.getversion() - print(string.format(" %d.%d.%d (%s)", + print(string.format(" %d.%d.%d (%s)", osversion.majorversion, osversion.minorversion, osversion.revision, osversion.description)) - + -- Multithreaded compiling if _ACTION == "vs2010" or _ACTION=="vs2008" then @@ -18,22 +18,22 @@ act = _ACTION end - newoption { - trigger = "ios", - description = "Enable iOS target (requires xcode4)" + newoption { + trigger = "ios", + description = "Enable iOS target (requires xcode4)" } newoption - { - trigger = "force_dlopen_opengl", - description = "Dynamically load OpenGL (instead of static/dynamic linking)" - } + { + trigger = "force_dlopen_opengl", + description = "Dynamically load OpenGL (instead of static/dynamic linking)" + } newoption - { - trigger = "force_dlopen_x11", - description = "Dynamically load OpenGL (instead of static/dynamic linking)" - } + { + trigger = "force_dlopen_x11", + description = "Dynamically load OpenGL (instead of static/dynamic linking)" + } newoption { @@ -49,43 +49,55 @@ -- --_OPTIONS["midi"] = "1"; - newoption - { - trigger = "bullet2demos", - description = "Compile the Bullet 2 demos (Demo/Extra folder)" - } + newoption + { + trigger = "no-demos", + description = "Don't build demos" + } newoption { trigger = "enet", description = "Enable enet NAT punchthrough test" } + newoption { trigger = "lua", description = "Enable Lua scipting support in Example Browser" } - newoption { - trigger = "targetdir", - value = "path such as ../bin", - description = "Set the output location for the generated project files" - } - - + newoption { + trigger = "targetdir", + value = "path such as ../bin", + description = "Set the output location for the generated project files" + } + newoption { - trigger = "without-gtest", + trigger = "no-test", + description = "Disable all tests" + } + + newoption + { + trigger = "no-gtest", description = "Disable unit tests using gtest" } + newoption + { + trigger = "no-bullet3", + description = "Do not build bullet3 libs" + } + configurations {"Release", "Debug"} configuration "Release" flags { "Optimize", "EnableSSE2","StaticRuntime", "NoMinimalRebuild", "FloatFast"} configuration "Debug" defines {"_DEBUG=1"} flags { "Symbols", "StaticRuntime" , "NoMinimalRebuild", "NoEditAndContinue" ,"FloatFast"} - + if os.is("Linux") or os.is("macosx") then if os.is64bit() then platforms {"x64"} @@ -112,25 +124,25 @@ postfix="" if _ACTION == "xcode4" then - if _OPTIONS["ios"] then - postfix = "ios"; - xcodebuildsettings - { - 'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"', - 'CODE_SIGN_IDENTITY = "iPhone Developer"', - "SDKROOT = iphoneos", - 'ARCHS = "armv7"', - 'TARGETED_DEVICE_FAMILY = "1,2"', - 'VALID_ARCHS = "armv7"', - } - else + if _OPTIONS["ios"] then + postfix = "ios"; + xcodebuildsettings + { + 'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"', + 'CODE_SIGN_IDENTITY = "iPhone Developer"', + "SDKROOT = iphoneos", + 'ARCHS = "armv7"', + 'TARGETED_DEVICE_FAMILY = "1,2"', + 'VALID_ARCHS = "armv7"', + } + else xcodebuildsettings { 'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"', 'VALID_ARCHS = "x86_64 i386"', -- 'SDKROOT = "macosx10.9"', } - end + end end -- comment-out for now, URDF reader needs exceptions @@ -148,57 +160,83 @@ dofile ("findOpenCL.lua") dofile ("findDirectX11.lua") dofile ("findOpenGLGlewGlut.lua") - + if (not findOpenGL3()) then defines {"NO_OPENGL3"} end language "C++" -if not _OPTIONS["ios"] then + if _OPTIONS["ios"] then + _OPTIONS["no-bullet3"] = "1" + _OPTIONS["no-gtest"] = "1" + end - include "../examples/ExampleBrowser" - include "../examples/OpenGLWindow" - include "../examples/SharedMemory" - include "../examples/MultiThreading" - include "../examples/ThirdPartyLibs/Gwen" - include "../Extras" + if _OPTIONS["no-bullet3"] then + _OPTIONS["no-demos"] = "1" + else + include "../src/Bullet3Common" + include "../src/Bullet3Geometry" + include "../src/Bullet3Collision" + include "../src/Bullet3Dynamics" + include "../src/Bullet3OpenCL" + include "../src/Bullet3Serialize/Bullet2FileLoader" + end - include "../examples/HelloWorld" - include "../examples/BasicDemo" - include "../test/SharedMemory" - - if _OPTIONS["enet"] then - include "../examples/ThirdPartyLibs/enet" - include "../test/enet/client" - include "../test/enet/server" - end + if _OPTIONS["no-extras"] then + _OPTIONS["no-demos"] = "1" + else + include "../Extras" + end - if _OPTIONS["lua"] then - include "../examples/ThirdPartyLibs/lua-5.2.3" - end - - include "../src/Bullet3Common" - include "../src/Bullet3Geometry" - include "../src/Bullet3Collision" - include "../src/Bullet3Dynamics" - include "../src/Bullet3OpenCL" - include "../src/Bullet3Serialize/Bullet2FileLoader" + if not _OPTIONS["no-demos"] then + include "../examples/ExampleBrowser" + include "../examples/OpenGLWindow" + include "../examples/ThirdPartyLibs/Gwen" - if not _OPTIONS["without-gtest"] then - include "../test/gtest-1.7.0" --- include "../test/hello_gtest" - include "../test/collision" - include "../test/InverseDynamics" - include "../test/TestBullet3OpenCL" - include "../test/GwenOpenGLTest" + include "../examples/HelloWorld" + include "../examples/BasicDemo" + + include "../examples/SharedMemory" + include "../examples/MultiThreading" + + if _OPTIONS["lua"] then + include "../examples/ThirdPartyLibs/lua-5.2.3" end -end - include "../test/Bullet2" + if not _OPTIONS["no-test"] then + include "../test/SharedMemory" + if _OPTIONS["enet"] then + include "../examples/ThirdPartyLibs/enet" + include "../test/enet/client" + include "../test/enet/server" + end + end + end + + if not _OPTIONS["no-test"] then + include "../test/Bullet2" + + if not _OPTIONS["no-gtest"] then + include "../test/gtest-1.7.0" +-- include "../test/hello_gtest" + include "../test/collision" + if not _OPTIONS["no-bullet3"] then + if _OPTIONS["no-extras"] then + include "../test/InverseDynamics" + end + include "../test/TestBullet3OpenCL" + end + if not _OPTIONS["no-demos"] then + -- Gwen is only used for demos + include "../test/GwenOpenGLTest" + end + end + end + include "../src/BulletInverseDynamics" include "../src/BulletSoftBody" - include "../src/BulletDynamics" - include "../src/BulletCollision" - include "../src/LinearMath" - + include "../src/BulletDynamics" + include "../src/BulletCollision" + include "../src/LinearMath" + From d8b7d12707915b8057d2d5330869600cb1b16768 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 3 Dec 2015 20:39:29 -0800 Subject: [PATCH 3/9] combine checks for "ios" premake option The "ios" option now only makes sense when action is "xcode" --- build3/premake4.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build3/premake4.lua b/build3/premake4.lua index 3fb80e839..d3eed9829 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -125,6 +125,9 @@ if _ACTION == "xcode4" then if _OPTIONS["ios"] then + _OPTIONS["no-bullet3"] = "1" + _OPTIONS["no-gtest"] = "1" + postfix = "ios"; xcodebuildsettings { @@ -167,11 +170,6 @@ language "C++" - if _OPTIONS["ios"] then - _OPTIONS["no-bullet3"] = "1" - _OPTIONS["no-gtest"] = "1" - end - if _OPTIONS["no-bullet3"] then _OPTIONS["no-demos"] = "1" else From 1c30453ae462c8ec3d32e9587aa468d1d70261d7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 3 Dec 2015 20:49:31 -0800 Subject: [PATCH 4/9] adding forgotten --no-extras build option --- build3/premake4.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build3/premake4.lua b/build3/premake4.lua index d3eed9829..38519f640 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -55,6 +55,12 @@ description = "Don't build demos" } + newoption + { + trigger = "no-extras", + description = "Don't build Extras" + } + newoption { trigger = "enet", @@ -171,6 +177,7 @@ language "C++" if _OPTIONS["no-bullet3"] then + print "--no-bullet3 implies --no-demos" _OPTIONS["no-demos"] = "1" else include "../src/Bullet3Common" @@ -182,6 +189,7 @@ end if _OPTIONS["no-extras"] then + print "--no-extras implies --no-demos" _OPTIONS["no-demos"] = "1" else include "../Extras" From b8f72ee56b2b6906f21538f4c319148a4757d997 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 3 Dec 2015 20:52:28 -0800 Subject: [PATCH 5/9] fix bad --no-extras option for InverseDynamcis --- build3/premake4.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build3/premake4.lua b/build3/premake4.lua index 38519f640..5d6683b92 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -228,7 +228,7 @@ -- include "../test/hello_gtest" include "../test/collision" if not _OPTIONS["no-bullet3"] then - if _OPTIONS["no-extras"] then + if not _OPTIONS["no-extras"] then include "../test/InverseDynamics" end include "../test/TestBullet3OpenCL" From e66be7a7efef54cb7c00b0ecfbf1802969da75db Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 3 Dec 2015 22:00:52 -0800 Subject: [PATCH 6/9] replaced spaced indentation with tabs --- build3/premake4.lua | 214 ++++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/build3/premake4.lua b/build3/premake4.lua index 5d6683b92..b09f3be50 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -1,5 +1,5 @@ - solution "0_Bullet3Solution" + solution "0_Bullet3Solution" local osversion = os.getversion() print(string.format(" %d.%d.%d (%s)", @@ -14,26 +14,26 @@ act = "" - if _ACTION then - act = _ACTION - end + if _ACTION then + act = _ACTION + end - newoption { - trigger = "ios", - description = "Enable iOS target (requires xcode4)" + newoption { + trigger = "ios", + description = "Enable iOS target (requires xcode4)" } newoption - { - trigger = "force_dlopen_opengl", - description = "Dynamically load OpenGL (instead of static/dynamic linking)" - } + { + trigger = "force_dlopen_opengl", + description = "Dynamically load OpenGL (instead of static/dynamic linking)" + } newoption - { - trigger = "force_dlopen_x11", - description = "Dynamically load OpenGL (instead of static/dynamic linking)" - } + { + trigger = "force_dlopen_x11", + description = "Dynamically load OpenGL (instead of static/dynamic linking)" + } newoption { @@ -49,17 +49,17 @@ -- --_OPTIONS["midi"] = "1"; - newoption - { - trigger = "no-demos", - description = "Don't build demos" - } + newoption + { + trigger = "no-demos", + description = "Don't build demos" + } - newoption - { - trigger = "no-extras", - description = "Don't build Extras" - } + newoption + { + trigger = "no-extras", + description = "Don't build Extras" + } newoption { @@ -74,10 +74,10 @@ } newoption { - trigger = "targetdir", - value = "path such as ../bin", - description = "Set the output location for the generated project files" - } + trigger = "targetdir", + value = "path such as ../bin", + description = "Set the output location for the generated project files" + } newoption { @@ -91,11 +91,11 @@ description = "Disable unit tests using gtest" } - newoption - { - trigger = "no-bullet3", - description = "Do not build bullet3 libs" - } + newoption + { + trigger = "no-bullet3", + description = "Do not build bullet3 libs" + } configurations {"Release", "Debug"} configuration "Release" @@ -130,25 +130,25 @@ postfix="" if _ACTION == "xcode4" then - if _OPTIONS["ios"] then - _OPTIONS["no-bullet3"] = "1" - _OPTIONS["no-gtest"] = "1" + if _OPTIONS["ios"] then + _OPTIONS["no-bullet3"] = "1" + _OPTIONS["no-gtest"] = "1" - postfix = "ios"; - xcodebuildsettings - { - 'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"', - 'CODE_SIGN_IDENTITY = "iPhone Developer"', - "SDKROOT = iphoneos", - 'ARCHS = "armv7"', - 'TARGETED_DEVICE_FAMILY = "1,2"', - 'VALID_ARCHS = "armv7"', - } + postfix = "ios"; + xcodebuildsettings + { + 'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"', + 'CODE_SIGN_IDENTITY = "iPhone Developer"', + "SDKROOT = iphoneos", + 'ARCHS = "armv7"', + 'TARGETED_DEVICE_FAMILY = "1,2"', + 'VALID_ARCHS = "armv7"', + } else xcodebuildsettings { - 'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"', - 'VALID_ARCHS = "x86_64 i386"', + 'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"', + 'VALID_ARCHS = "x86_64 i386"', -- 'SDKROOT = "macosx10.9"', } end @@ -176,73 +176,73 @@ language "C++" - if _OPTIONS["no-bullet3"] then - print "--no-bullet3 implies --no-demos" - _OPTIONS["no-demos"] = "1" - else - include "../src/Bullet3Common" - include "../src/Bullet3Geometry" - include "../src/Bullet3Collision" - include "../src/Bullet3Dynamics" - include "../src/Bullet3OpenCL" - include "../src/Bullet3Serialize/Bullet2FileLoader" - end + if _OPTIONS["no-bullet3"] then + print "--no-bullet3 implies --no-demos" + _OPTIONS["no-demos"] = "1" + else + include "../src/Bullet3Common" + include "../src/Bullet3Geometry" + include "../src/Bullet3Collision" + include "../src/Bullet3Dynamics" + include "../src/Bullet3OpenCL" + include "../src/Bullet3Serialize/Bullet2FileLoader" + end - if _OPTIONS["no-extras"] then - print "--no-extras implies --no-demos" - _OPTIONS["no-demos"] = "1" - else - include "../Extras" - end + if _OPTIONS["no-extras"] then + print "--no-extras implies --no-demos" + _OPTIONS["no-demos"] = "1" + else + include "../Extras" + end - if not _OPTIONS["no-demos"] then - include "../examples/ExampleBrowser" - include "../examples/OpenGLWindow" - include "../examples/ThirdPartyLibs/Gwen" + if not _OPTIONS["no-demos"] then + include "../examples/ExampleBrowser" + include "../examples/OpenGLWindow" + include "../examples/ThirdPartyLibs/Gwen" - include "../examples/HelloWorld" - include "../examples/BasicDemo" + include "../examples/HelloWorld" + include "../examples/BasicDemo" - include "../examples/SharedMemory" - include "../examples/MultiThreading" + include "../examples/SharedMemory" + include "../examples/MultiThreading" - if _OPTIONS["lua"] then - include "../examples/ThirdPartyLibs/lua-5.2.3" - end + if _OPTIONS["lua"] then + include "../examples/ThirdPartyLibs/lua-5.2.3" + end - if not _OPTIONS["no-test"] then - include "../test/SharedMemory" - if _OPTIONS["enet"] then - include "../examples/ThirdPartyLibs/enet" - include "../test/enet/client" - include "../test/enet/server" - end - end - end + if not _OPTIONS["no-test"] then + include "../test/SharedMemory" + if _OPTIONS["enet"] then + include "../examples/ThirdPartyLibs/enet" + include "../test/enet/client" + include "../test/enet/server" + end + end + end - if not _OPTIONS["no-test"] then - include "../test/Bullet2" + if not _OPTIONS["no-test"] then + include "../test/Bullet2" - if not _OPTIONS["no-gtest"] then - include "../test/gtest-1.7.0" --- include "../test/hello_gtest" - include "../test/collision" - if not _OPTIONS["no-bullet3"] then - if not _OPTIONS["no-extras"] then - include "../test/InverseDynamics" - end - include "../test/TestBullet3OpenCL" - end - if not _OPTIONS["no-demos"] then - -- Gwen is only used for demos - include "../test/GwenOpenGLTest" - end - end - end + if not _OPTIONS["no-gtest"] then + include "../test/gtest-1.7.0" +-- include "../test/hello_gtest" + include "../test/collision" + if not _OPTIONS["no-bullet3"] then + if not _OPTIONS["no-extras"] then + include "../test/InverseDynamics" + end + include "../test/TestBullet3OpenCL" + end + if not _OPTIONS["no-demos"] then + -- Gwen is only used for demos + include "../test/GwenOpenGLTest" + end + end + end include "../src/BulletInverseDynamics" include "../src/BulletSoftBody" - include "../src/BulletDynamics" - include "../src/BulletCollision" - include "../src/LinearMath" + include "../src/BulletDynamics" + include "../src/BulletCollision" + include "../src/LinearMath" From a860fff3adb21a03dc81faff2013bf94b28a1e60 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 7 Dec 2015 13:43:17 -0800 Subject: [PATCH 7/9] fix cmake to succeed with -DBUILD_BULLET3=0 --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 3 ++- test/CMakeLists.txt | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e33f67f4..a376c0768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,7 +279,9 @@ ENDIF() set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet ) list (APPEND BULLET_LIBRARIES LinearMath) -list (APPEND BULLET_LIBRARIES BulletInverseDynamics) +IF(BUILD_BULLET3) + list (APPEND BULLET_LIBRARIES BulletInverseDynamics) +ENDIF(BUILD_BULLET3) list (APPEND BULLET_LIBRARIES BulletCollision) list (APPEND BULLET_LIBRARIES BulletDynamics) list (APPEND BULLET_LIBRARIES BulletSoftBody) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 712139ff0..bbeabafbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,10 @@ IF(BUILD_BULLET3) SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common ) + SUBDIRS( BulletInverseDynamics ) ENDIF(BUILD_BULLET3) -SUBDIRS( BulletSoftBody BulletInverseDynamics BulletCollision BulletDynamics LinearMath ) +SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) IF(INSTALL_LIBS) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 45369660d..84877f619 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,7 @@ -#SUBDIRS( gtest-1.7.0 TestBullet3OpenCL) -SUBDIRS( gtest-1.7.0 collision InverseDynamics) +IF(BUILD_BULLET3) + #SUBDIRS( TestBullet3OpenCL ) + SUBDIRS( InverseDynamics ) +ENDIF(BUILD_BULLET3) + +SUBDIRS( gtest-1.7.0 collision ) From c3460a6d488b8549309643b7cadac3d042a7dc71 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 7 Dec 2015 13:49:29 -0800 Subject: [PATCH 8/9] fix whitespace formatting --- test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 84877f619..2a0d88431 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,6 @@ IF(BUILD_BULLET3) - #SUBDIRS( TestBullet3OpenCL ) - SUBDIRS( InverseDynamics ) + #SUBDIRS( TestBullet3OpenCL ) + SUBDIRS( InverseDynamics ) ENDIF(BUILD_BULLET3) SUBDIRS( gtest-1.7.0 collision ) From c0c1691c25758d25a8b8282c9d3379b7464d0f1b Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 7 Dec 2015 14:08:04 -0800 Subject: [PATCH 9/9] fix whitespace formatting in cmake files --- CMakeLists.txt | 92 +++++++++---------- Extras/HACD/CMakeLists.txt | 2 +- Extras/InverseDynamics/CMakeLists.txt | 4 +- .../Serialize/BlenderSerialize/CMakeLists.txt | 2 +- .../Serialize/BulletFileLoader/CMakeLists.txt | 43 ++++----- .../BulletWorldImporter/CMakeLists.txt | 14 +-- .../BulletXmlWorldImporter/CMakeLists.txt | 10 +- .../Serialize/HeaderGenerator/CMakeLists.txt | 4 +- .../Serialize/ReadBulletSample/CMakeLists.txt | 6 +- Extras/Serialize/makesdna/CMakeLists.txt | 4 +- examples/BasicDemo/CMakeLists.txt | 8 +- examples/ExampleBrowser/CMakeLists.txt | 82 ++++++++--------- examples/HelloWorld/CMakeLists.txt | 10 +- examples/OpenGLWindow/CMakeLists.txt | 10 +- examples/SimpleOpenGL3/CMakeLists.txt | 24 ++--- .../ThirdPartyLibs/lua-5.2.3/CMakeLists.txt | 2 +- src/Bullet3Collision/CMakeLists.txt | 12 +-- src/Bullet3Common/CMakeLists.txt | 2 +- src/Bullet3Dynamics/CMakeLists.txt | 28 +++--- src/Bullet3Geometry/CMakeLists.txt | 2 +- src/Bullet3OpenCL/CMakeLists.txt | 62 ++++++------- .../Bullet2FileLoader/CMakeLists.txt | 28 +++--- src/BulletCollision/CMakeLists.txt | 6 +- src/BulletDynamics/CMakeLists.txt | 2 +- src/BulletInverseDynamics/CMakeLists.txt | 6 +- src/BulletSoftBody/CMakeLists.txt | 2 +- src/LinearMath/CMakeLists.txt | 2 +- test/InverseDynamics/CMakeLists.txt | 8 +- test/collision/CMakeLists.txt | 6 +- 29 files changed, 241 insertions(+), 242 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e33f67f4..0a3779b90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ ENDIF(COMMAND cmake_policy) IF (NOT CMAKE_BUILD_TYPE) # SET(CMAKE_BUILD_TYPE "Debug") 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") #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) 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 "/STACK:10000000 /INCREMENTAL:NO") +#SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO") +#SET(CMAKE_EXE_LINKER_FLAGS "/STACK:10000000 /INCREMENTAL:NO") #MESSAGE("MSVC_INCREMENTAL_YES_FLAG"+${MSVC_INCREMENTAL_YES_FLAG}) @@ -44,23 +44,23 @@ IF(MSVC) IF (NOT USE_MSVC_INCREMENTAL_LINKING) #MESSAGE("MSVC_INCREMENTAL_DEFAULT"+${MSVC_INCREMENTAL_DEFAULT}) 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}" ) 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}") - SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) + SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags3}" ) - + ENDIF (NOT USE_MSVC_INCREMENTAL_LINKING) IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL) @@ -126,7 +126,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES) 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 ) IF (USE_GLUT AND MSVC) - string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - remove_definitions(-D_WINDOWS ) + string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + remove_definitions(-D_WINDOWS ) ENDIF() @@ -161,11 +161,11 @@ ELSE(WIN32) OPTION(USE_GLUT "Use Glut" ON) ENDIF(WIN32) - + IF(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) ENDIF(COMMAND cmake_policy) - + # This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system # 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(APPLE) - MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}") - 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") - #unset(BUILD_OPENGL3_DEMOS CACHE) + MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}") + 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") + #unset(BUILD_OPENGL3_DEMOS CACHE) - OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF) - ELSE() - OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON) - ENDIF() - ELSE() - OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON) - ENDIF() + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF) + ELSE() + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON) + ENDIF() + ELSE() + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON) + ENDIF() ELSE(BUILD_BULLET3) unset(BUILD_OPENGL3_DEMOS CACHE) 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) IF(BUILD_BULLET2_DEMOS) - IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples) - SUBDIRS(examples) - ENDIF() + IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples) + SUBDIRS(examples) + ENDIF() 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_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name") ## 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") IF(NOT MSVC) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY) INSTALL( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc - DESTINATION - ${PKGCONFIG_INSTALL_PREFIX}) + FILES + ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc + DESTINATION + ${PKGCONFIG_INSTALL_PREFIX}) ENDIF(NOT MSVC) ENDIF(INSTALL_LIBS) @@ -284,11 +284,11 @@ list (APPEND BULLET_LIBRARIES BulletCollision) list (APPEND BULLET_LIBRARIES BulletDynamics) list (APPEND BULLET_LIBRARIES BulletSoftBody) set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake) -configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake - @ONLY ESCAPE_QUOTES - ) +configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake + @ONLY ESCAPE_QUOTES + ) install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake - ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake - DESTINATION ${BULLET_CONFIG_CMAKE_PATH} - ) + ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake + DESTINATION ${BULLET_CONFIG_CMAKE_PATH} + ) diff --git a/Extras/HACD/CMakeLists.txt b/Extras/HACD/CMakeLists.txt index e2f3a5672..664a51a5c 100644 --- a/Extras/HACD/CMakeLists.txt +++ b/Extras/HACD/CMakeLists.txt @@ -18,7 +18,7 @@ SET(HACD_HDRS hacdVector.h hacdVersion.h hacdCircularList.inl - hacdVector.inl + hacdVector.inl ) ADD_LIBRARY(HACD ${HACD_SRCS} ${HACD_HDRS}) diff --git a/Extras/InverseDynamics/CMakeLists.txt b/Extras/InverseDynamics/CMakeLists.txt index f40974485..56ed7d76b 100644 --- a/Extras/InverseDynamics/CMakeLists.txt +++ b/Extras/InverseDynamics/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES( +INCLUDE_DIRECTORIES( ${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}) 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) IF (INSTALL_EXTRA_LIBS) diff --git a/Extras/Serialize/BlenderSerialize/CMakeLists.txt b/Extras/Serialize/BlenderSerialize/CMakeLists.txt index 5b74d7447..4c75188f2 100644 --- a/Extras/Serialize/BlenderSerialize/CMakeLists.txt +++ b/Extras/Serialize/BlenderSerialize/CMakeLists.txt @@ -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}/Extras/Serialize/BulletFileLoader ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BlenderSerialize diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt index 51e33e44f..e88720ad3 100644 --- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt +++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src +INCLUDE_DIRECTORIES( + ${BULLET_PHYSICS_SOURCE_DIR}/src ) SET(BulletFileLoader_SRCS @@ -21,29 +21,30 @@ btBulletFile.h ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) + TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) 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}) IF (INSTALL_EXTRA_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - #FILES_MATCHING requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletFileLoader DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN -".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS BulletFileLoader DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX}) + INSTALL( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_EXTRA_LIBS) diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt index 666ac21c1..599625183 100644 --- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt @@ -1,21 +1,21 @@ -INCLUDE_DIRECTORIES( +INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ) ADD_LIBRARY( -BulletWorldImporter -btBulletWorldImporter.cpp -btBulletWorldImporter.h -btWorldImporter.cpp -btWorldImporter.h +BulletWorldImporter +btBulletWorldImporter.cpp +btBulletWorldImporter.h +btWorldImporter.cpp +btWorldImporter.h ) SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) + TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ENDIF (BUILD_SHARED_LIBS) IF (INSTALL_EXTRA_LIBS) diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt index c6a94f850..f45342101 100644 --- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt @@ -1,13 +1,13 @@ -INCLUDE_DIRECTORIES( +INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter ) ADD_LIBRARY( - BulletXmlWorldImporter - btBulletXmlWorldImporter.cpp - btBulletXmlWorldImporter.h + BulletXmlWorldImporter + btBulletXmlWorldImporter.cpp + btBulletXmlWorldImporter.h string_split.cpp string_split.h tinyxml.cpp @@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) 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) IF (INSTALL_EXTRA_LIBS) diff --git a/Extras/Serialize/HeaderGenerator/CMakeLists.txt b/Extras/Serialize/HeaderGenerator/CMakeLists.txt index 3791e2098..4739fcbdf 100644 --- a/Extras/Serialize/HeaderGenerator/CMakeLists.txt +++ b/Extras/Serialize/HeaderGenerator/CMakeLists.txt @@ -4,7 +4,7 @@ FILE(GLOB cpp_SRC "*.cpp") FILE(GLOB h_SRC "*.h") -SET(includes +SET(includes . ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader ${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) ADD_CUSTOM_COMMAND( - TARGET HeaderGenerator + TARGET HeaderGenerator 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/bulletGenerate.py ${CMAKE_CURRENT_BINARY_DIR}/bulletGenerate.py diff --git a/Extras/Serialize/ReadBulletSample/CMakeLists.txt b/Extras/Serialize/ReadBulletSample/CMakeLists.txt index e819b9e5e..6d6fbab58 100644 --- a/Extras/Serialize/ReadBulletSample/CMakeLists.txt +++ b/Extras/Serialize/ReadBulletSample/CMakeLists.txt @@ -1,6 +1,6 @@ INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src +${BULLET_PHYSICS_SOURCE_DIR}/src ) LINK_LIBRARIES( @@ -21,7 +21,7 @@ SET(READBULLET_SRC ) ADD_EXECUTABLE(AppReadBulletSample - ${READBULLET_SRC} + ${READBULLET_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 MINSIZEREL_POSTFIX "_MinsizeRel") SET_TARGET_PROPERTIES(AppReadBulletSample PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") -ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/Extras/Serialize/makesdna/CMakeLists.txt b/Extras/Serialize/makesdna/CMakeLists.txt index 9f5d5c683..04fcdfc7f 100644 --- a/Extras/Serialize/makesdna/CMakeLists.txt +++ b/Extras/Serialize/makesdna/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.4) - + IF(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) ENDIF(COMMAND cmake_policy) @@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/src ) SET (INC_FILES DNA_rigidbody.h - + ${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btVector3.h ${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btMatrix3x3.h ${BULLET_PHYSICS_SOURCE_DIR}/src/LinearMath/btTransform.h diff --git a/examples/BasicDemo/CMakeLists.txt b/examples/BasicDemo/CMakeLists.txt index 8f3b50a5a..716c3a064 100644 --- a/examples/BasicDemo/CMakeLists.txt +++ b/examples/BasicDemo/CMakeLists.txt @@ -1,16 +1,16 @@ # App_BasicExample is a minimal sample creating, stepping and deleting a Bullet dynamics world INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src +${BULLET_PHYSICS_SOURCE_DIR}/src ) LINK_LIBRARIES( - BulletDynamics BulletCollision LinearMath + BulletDynamics BulletCollision LinearMath ) IF (WIN32) ADD_EXECUTABLE(App_BasicExample - BasicExample.cpp + BasicExample.cpp main.cpp ${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 MINSIZEREL_POSTFIX "_MinsizeRel") SET_TARGET_PROPERTIES(App_BasicExample PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") -ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index d775d9d51..88cc30b7a 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( . - ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs ) @@ -68,14 +68,14 @@ SET(App_ExampleBrowser_SRCS ../DynamicControlDemo/MotorDemo.cpp ../DynamicControlDemo/MotorDemo.h ../MultiThreading/MultiThreadingExample.cpp - ../MultiThreading/b3PosixThreadSupport.cpp + ../MultiThreading/b3PosixThreadSupport.cpp ../MultiThreading/b3Win32ThreadSupport.cpp - ../MultiThreading/b3ThreadSupportInterface.cpp + ../MultiThreading/b3ThreadSupportInterface.cpp ../RenderingExamples/TimeSeriesCanvas.cpp ../RenderingExamples/TimeSeriesCanvas.h ../RenderingExamples/TimeSeriesFontData.cpp ../RenderingExamples/TimeSeriesFontData.h - + ../RenderingExamples/CoordinateSystemDemo.cpp ../RenderingExamples/CoordinateSystemDemo.h ../RenderingExamples/RaytracerSetup.cpp @@ -90,7 +90,7 @@ SET(App_ExampleBrowser_SRCS ../Raycast/RaytestDemo.cpp ../Importers/ImportBsp/BspConverter.h ../Importers/ImportBullet/SerializeSetup.cpp - ../Importers/ImportBullet/SerializeSetup.h + ../Importers/ImportBullet/SerializeSetup.h ../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp ../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp @@ -151,38 +151,38 @@ SET(App_ExampleBrowser_SRCS ../Constraints/Dof6Spring2Setup.h ../Constraints/ConstraintPhysicsSetup.cpp ../Constraints/ConstraintPhysicsSetup.h - - + + ../ThirdPartyLibs/stb_image/stb_image.cpp ../ThirdPartyLibs/stb_image/stb_image.h - ../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp - ../ThirdPartyLibs/tinyxml/tinystr.cpp - ../ThirdPartyLibs/tinyxml/tinyxml.cpp - ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp - ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp + ../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp + ../ThirdPartyLibs/tinyxml/tinystr.cpp + ../ThirdPartyLibs/tinyxml/tinyxml.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp + - ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp - ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp - ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp - ../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_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/link.h - ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h - ../ThirdPartyLibs/tinyxml/tinystr.cpp - ../ThirdPartyLibs/tinyxml/tinyxml.cpp - ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp - ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp - ../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h - ../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h - ../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp - ../ThirdPartyLibs/urdf/boost_replacement/printf_console.h - ../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp - ../ThirdPartyLibs/urdf/boost_replacement/string_split.h + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp + ../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_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/link.h + ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h + ../ThirdPartyLibs/tinyxml/tinystr.cpp + ../ThirdPartyLibs/tinyxml/tinyxml.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp + ../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h + ../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h + ../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp + ../ThirdPartyLibs/urdf/boost_replacement/printf_console.h + ../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp + ../ThirdPartyLibs/urdf/boost_replacement/string_split.h ../Utils/b3Clock.cpp ../Utils/b3Clock.h ../Utils/b3ResourcePath.cpp @@ -193,7 +193,7 @@ SET(App_ExampleBrowser_SRCS ) 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) @@ -204,27 +204,25 @@ IF (WIN32) ADD_DEFINITIONS(-DGLEW_STATIC) ELSE(WIN32) IF(APPLE) - find_library(COCOA NAMES Cocoa) - MESSAGE(${COCOA}) - link_libraries(${COCOA}) + find_library(COCOA NAMES Cocoa) + MESSAGE(${COCOA}) + link_libraries(${COCOA}) ELSE(APPLE) ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_STATIC") - ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") - INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew - ) + ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") + INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) LINK_LIBRARIES( pthread dl) ENDIF(APPLE) ENDIF(WIN32) - - + + ADD_EXECUTABLE(App_ExampleBrowser ${App_ExampleBrowser_SRCS} ) - + IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) SET_TARGET_PROPERTIES(App_ExampleBrowser PROPERTIES DEBUG_POSTFIX "_Debug") diff --git a/examples/HelloWorld/CMakeLists.txt b/examples/HelloWorld/CMakeLists.txt index 66fcab054..f61fbe676 100644 --- a/examples/HelloWorld/CMakeLists.txt +++ b/examples/HelloWorld/CMakeLists.txt @@ -1,21 +1,21 @@ # HelloWorld is a minimal sample creating, stepping and deleting a Bullet dynamics world INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src +${BULLET_PHYSICS_SOURCE_DIR}/src ) LINK_LIBRARIES( - BulletDynamics BulletCollision LinearMath + BulletDynamics BulletCollision LinearMath ) IF (WIN32) ADD_EXECUTABLE(App_HelloWorld - HelloWorld.cpp + HelloWorld.cpp ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ) ELSE() ADD_EXECUTABLE(App_HelloWorld - HelloWorld.cpp + HelloWorld.cpp ) 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 MINSIZEREL_POSTFIX "_MinsizeRel") SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") -ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/examples/OpenGLWindow/CMakeLists.txt b/examples/OpenGLWindow/CMakeLists.txt index 451ea3dcd..a45eb661e 100644 --- a/examples/OpenGLWindow/CMakeLists.txt +++ b/examples/OpenGLWindow/CMakeLists.txt @@ -19,7 +19,7 @@ LIST(REMOVE_ITEM OpenGLWindowCommon_CPP X11OpenGLWindow.cpp ) #MESSAGE (${OpenGLWindowCommon_CPP}) 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( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) @@ -34,10 +34,10 @@ ENDIF(APPLE) IF(NOT WIN32 AND NOT APPLE) INCLUDE_DIRECTORIES( ${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_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} ) ENDIF() @@ -57,7 +57,7 @@ if (BUILD_SHARED_LIBS) target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY}) else() set (CMAKE_THREAD_PREFER_PTHREAD TRUE) - FIND_PACKAGE(Threads) + FIND_PACKAGE(Threads) target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT}) endif() endif() diff --git a/examples/SimpleOpenGL3/CMakeLists.txt b/examples/SimpleOpenGL3/CMakeLists.txt index beb8aa17e..7572c5bac 100644 --- a/examples/SimpleOpenGL3/CMakeLists.txt +++ b/examples/SimpleOpenGL3/CMakeLists.txt @@ -1,20 +1,20 @@ INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/btgui ${BULLET_PHYSICS_SOURCE_DIR}/examples ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) - - + + SET(AppSimpleOpenGL3_SRCS main.cpp ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ) LINK_LIBRARIES( - gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) IF (WIN32) @@ -28,14 +28,14 @@ ELSE(WIN32) find_library(COCOA NAMES Cocoa) MESSAGE(${COCOA}) link_libraries(${COCOA}) - ELSE(APPLE) - INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows - ) - ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") - ADD_DEFINITIONS("-DGLEW_STATIC") - ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") + ELSE(APPLE) + INCLUDE_DIRECTORIES( + ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows + ) + ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") + ADD_DEFINITIONS("-DGLEW_STATIC") + ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") LINK_LIBRARIES( X11 pthread dl Xext) ENDIF(APPLE) @@ -45,7 +45,7 @@ ENDIF(WIN32) ADD_EXECUTABLE(AppSimpleOpenGL3 ${AppSimpleOpenGL3_SRCS} ) - + IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) SET_TARGET_PROPERTIES(AppSimpleOpenGL3 PROPERTIES DEBUG_POSTFIX "_Debug") diff --git a/examples/ThirdPartyLibs/lua-5.2.3/CMakeLists.txt b/examples/ThirdPartyLibs/lua-5.2.3/CMakeLists.txt index fe5b8c063..4dac5e0c0 100644 --- a/examples/ThirdPartyLibs/lua-5.2.3/CMakeLists.txt +++ b/examples/ThirdPartyLibs/lua-5.2.3/CMakeLists.txt @@ -1,6 +1,6 @@ INCLUDE_DIRECTORIES( - . + . src ) diff --git a/src/Bullet3Collision/CMakeLists.txt b/src/Bullet3Collision/CMakeLists.txt index 3ba4d9b9f..130095cc0 100644 --- a/src/Bullet3Collision/CMakeLists.txt +++ b/src/Bullet3Collision/CMakeLists.txt @@ -4,11 +4,11 @@ INCLUDE_DIRECTORIES( ) SET(Bullet3Collision_SRCS - BroadPhaseCollision/b3DynamicBvh.cpp - BroadPhaseCollision/b3DynamicBvhBroadphase.cpp - BroadPhaseCollision/b3OverlappingPairCache.cpp - NarrowPhaseCollision/b3ConvexUtility.cpp - NarrowPhaseCollision/b3CpuNarrowPhase.cpp + BroadPhaseCollision/b3DynamicBvh.cpp + BroadPhaseCollision/b3DynamicBvhBroadphase.cpp + BroadPhaseCollision/b3OverlappingPairCache.cpp + NarrowPhaseCollision/b3ConvexUtility.cpp + NarrowPhaseCollision/b3CpuNarrowPhase.cpp ) SET(Bullet3CollisionBroadPhase_HDRS @@ -71,7 +71,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS Bullet3Collision DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS Bullet3Collision + INSTALL(TARGETS Bullet3Collision RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/src/Bullet3Common/CMakeLists.txt b/src/Bullet3Common/CMakeLists.txt index 61bece8f5..e899e67d9 100644 --- a/src/Bullet3Common/CMakeLists.txt +++ b/src/Bullet3Common/CMakeLists.txt @@ -45,7 +45,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS Bullet3Common DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS Bullet3Common + INSTALL(TARGETS Bullet3Common RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/src/Bullet3Dynamics/CMakeLists.txt b/src/Bullet3Dynamics/CMakeLists.txt index 0b0deed98..94c120d9b 100644 --- a/src/Bullet3Dynamics/CMakeLists.txt +++ b/src/Bullet3Dynamics/CMakeLists.txt @@ -14,19 +14,19 @@ SET(Bullet3Dynamics_SRCS SET(Bullet3Dynamics_HDRS b3CpuRigidBodyPipeline.h - ConstraintSolver/b3ContactSolverInfo.h - ConstraintSolver/b3FixedConstraint.h - ConstraintSolver/b3Generic6DofConstraint.h - ConstraintSolver/b3JacobianEntry.h - ConstraintSolver/b3PgsJacobiSolver.h - ConstraintSolver/b3Point2PointConstraint.h - ConstraintSolver/b3SolverBody.h - ConstraintSolver/b3SolverConstraint.h - ConstraintSolver/b3TypedConstraint.h - shared/b3ContactConstraint4.h - shared/b3ConvertConstraint4.h - shared/b3Inertia.h - shared/b3IntegrateTransforms.h + ConstraintSolver/b3ContactSolverInfo.h + ConstraintSolver/b3FixedConstraint.h + ConstraintSolver/b3Generic6DofConstraint.h + ConstraintSolver/b3JacobianEntry.h + ConstraintSolver/b3PgsJacobiSolver.h + ConstraintSolver/b3Point2PointConstraint.h + ConstraintSolver/b3SolverBody.h + ConstraintSolver/b3SolverConstraint.h + ConstraintSolver/b3TypedConstraint.h + shared/b3ContactConstraint4.h + shared/b3ConvertConstraint4.h + shared/b3Inertia.h + shared/b3IntegrateTransforms.h ) ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS}) @@ -43,7 +43,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS Bullet3Dynamics DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS Bullet3Dynamics + INSTALL(TARGETS Bullet3Dynamics RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/src/Bullet3Geometry/CMakeLists.txt b/src/Bullet3Geometry/CMakeLists.txt index 7e781278a..820687270 100644 --- a/src/Bullet3Geometry/CMakeLists.txt +++ b/src/Bullet3Geometry/CMakeLists.txt @@ -29,7 +29,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS Bullet3Geometry DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS Bullet3Geometry + INSTALL(TARGETS Bullet3Geometry RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/src/Bullet3OpenCL/CMakeLists.txt b/src/Bullet3OpenCL/CMakeLists.txt index 286822272..e604a903f 100644 --- a/src/Bullet3OpenCL/CMakeLists.txt +++ b/src/Bullet3OpenCL/CMakeLists.txt @@ -3,36 +3,36 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ) ADD_DEFINITIONS(-DB3_USE_CLEW) SET(Bullet3OpenCL_clew_SRCS - ../clew/clew.c - BroadphaseCollision/b3GpuGridBroadphase.cpp - BroadphaseCollision/b3GpuSapBroadphase.cpp + ../clew/clew.c + BroadphaseCollision/b3GpuGridBroadphase.cpp + BroadphaseCollision/b3GpuSapBroadphase.cpp BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp BroadphaseCollision/b3GpuParallelLinearBvh.cpp - Initialize/b3OpenCLUtils.cpp - NarrowphaseCollision/b3ContactCache.cpp - NarrowphaseCollision/b3ConvexHullContact.cpp - NarrowphaseCollision/b3GjkEpa.cpp - NarrowphaseCollision/b3GjkPairDetector.cpp - NarrowphaseCollision/b3OptimizedBvh.cpp - NarrowphaseCollision/b3QuantizedBvh.cpp - NarrowphaseCollision/b3StridingMeshInterface.cpp - NarrowphaseCollision/b3TriangleCallback.cpp - NarrowphaseCollision/b3TriangleIndexVertexArray.cpp - NarrowphaseCollision/b3VoronoiSimplexSolver.cpp - ParallelPrimitives/b3BoundSearchCL.cpp - ParallelPrimitives/b3FillCL.cpp - ParallelPrimitives/b3LauncherCL.cpp - ParallelPrimitives/b3PrefixScanCL.cpp - ParallelPrimitives/b3PrefixScanFloat4CL.cpp - ParallelPrimitives/b3RadixSort32CL.cpp - Raycast/b3GpuRaycast.cpp - RigidBody/b3GpuGenericConstraint.cpp - RigidBody/b3GpuJacobiContactSolver.cpp - RigidBody/b3GpuNarrowPhase.cpp - RigidBody/b3GpuPgsConstraintSolver.cpp - RigidBody/b3GpuPgsContactSolver.cpp - RigidBody/b3GpuRigidBodyPipeline.cpp - RigidBody/b3Solver.cpp + Initialize/b3OpenCLUtils.cpp + NarrowphaseCollision/b3ContactCache.cpp + NarrowphaseCollision/b3ConvexHullContact.cpp + NarrowphaseCollision/b3GjkEpa.cpp + NarrowphaseCollision/b3GjkPairDetector.cpp + NarrowphaseCollision/b3OptimizedBvh.cpp + NarrowphaseCollision/b3QuantizedBvh.cpp + NarrowphaseCollision/b3StridingMeshInterface.cpp + NarrowphaseCollision/b3TriangleCallback.cpp + NarrowphaseCollision/b3TriangleIndexVertexArray.cpp + NarrowphaseCollision/b3VoronoiSimplexSolver.cpp + ParallelPrimitives/b3BoundSearchCL.cpp + ParallelPrimitives/b3FillCL.cpp + ParallelPrimitives/b3LauncherCL.cpp + ParallelPrimitives/b3PrefixScanCL.cpp + ParallelPrimitives/b3PrefixScanFloat4CL.cpp + ParallelPrimitives/b3RadixSort32CL.cpp + Raycast/b3GpuRaycast.cpp + RigidBody/b3GpuGenericConstraint.cpp + RigidBody/b3GpuJacobiContactSolver.cpp + RigidBody/b3GpuNarrowPhase.cpp + RigidBody/b3GpuPgsConstraintSolver.cpp + RigidBody/b3GpuPgsContactSolver.cpp + RigidBody/b3GpuRigidBodyPipeline.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) 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) SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES FRAMEWORK true) - + SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES PUBLIC_HEADER "${Root_HDRS}") # Have to list out sub-directories manually: SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) - + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt index 169004557..125576634 100644 --- a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt +++ b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt @@ -4,23 +4,23 @@ INCLUDE_DIRECTORIES( ) SET(Bullet2FileLoader_SRCS - b3BulletFile.cpp - b3Chunk.cpp - b3DNA.cpp - b3File.cpp - b3Serializer.cpp + b3BulletFile.cpp + b3Chunk.cpp + b3DNA.cpp + b3File.cpp + b3Serializer.cpp ) - + SET(Bullet2FileLoader_HDRS b3BulletFile.h - b3Chunk.h - b3Common.h - b3Defines.h - b3DNA.h - b3File.h - b3Serializer.h - autogenerated/bullet2.h + b3Chunk.h + b3Common.h + b3Defines.h + b3DNA.h + b3File.h + b3Serializer.h + autogenerated/bullet2.h ) ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS}) @@ -37,7 +37,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS Bullet2FileLoader DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS Bullet2FileLoader + INSTALL(TARGETS Bullet2FileLoader RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index 3648fb404..90741a126 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -271,10 +271,10 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision) 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) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true) - + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}") # Have to list out sub-directories manually: 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 ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact) SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision) - + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt index b053c5787..b8c37b0d2 100644 --- a/src/BulletDynamics/CMakeLists.txt +++ b/src/BulletDynamics/CMakeLists.txt @@ -98,7 +98,7 @@ SET(MLCPSolvers_HDRS MLCPSolvers/btMLCPSolver.h MLCPSolvers/btMLCPSolverInterface.h MLCPSolvers/btPATHSolver.h - MLCPSolvers/btSolveProjectedGaussSeidel.h + MLCPSolvers/btSolveProjectedGaussSeidel.h MLCPSolvers/btLemkeSolver.h MLCPSolvers/btLemkeAlgorithm.h ) diff --git a/src/BulletInverseDynamics/CMakeLists.txt b/src/BulletInverseDynamics/CMakeLists.txt index f680449ac..3331c27ea 100644 --- a/src/BulletInverseDynamics/CMakeLists.txt +++ b/src/BulletInverseDynamics/CMakeLists.txt @@ -53,14 +53,14 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics) 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) SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES FRAMEWORK true) - + SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES PUBLIC_HEADER "${BulletInverseDynamicsRoot_HDRS}") # Have to list out sub-directories manually: SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details) - + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt index e66bd02d4..1538eb037 100644 --- a/src/BulletSoftBody/CMakeLists.txt +++ b/src/BulletSoftBody/CMakeLists.txt @@ -1,7 +1,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src - + ) #SUBDIRS( Solvers ) diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt index 8d8a54b9e..3846fb71d 100644 --- a/src/LinearMath/CMakeLists.txt +++ b/src/LinearMath/CMakeLists.txt @@ -54,7 +54,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS LinearMath DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS LinearMath + INSTALL(TARGETS LinearMath RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/test/InverseDynamics/CMakeLists.txt b/test/InverseDynamics/CMakeLists.txt index e8f39846c..89d70c06a 100644 --- a/test/InverseDynamics/CMakeLists.txt +++ b/test/InverseDynamics/CMakeLists.txt @@ -1,6 +1,6 @@ - - + + INCLUDE_DIRECTORIES( . ../../src @@ -15,8 +15,8 @@ ADD_DEFINITIONS(-D_VARIADIC_MAX=10) LINK_LIBRARIES( BulletInverseDynamicsUtils BulletInverseDynamics Bullet3Common LinearMath gtest ) -IF (NOT WIN32) - LINK_LIBRARIES( pthread ) +IF (NOT WIN32) + LINK_LIBRARIES( pthread ) ENDIF() diff --git a/test/collision/CMakeLists.txt b/test/collision/CMakeLists.txt index 1c94cc073..b36c151be 100644 --- a/test/collision/CMakeLists.txt +++ b/test/collision/CMakeLists.txt @@ -1,4 +1,4 @@ - + INCLUDE_DIRECTORIES( . ../../src @@ -13,8 +13,8 @@ LINK_LIBRARIES( LinearMath gtest ) -IF (NOT WIN32) - LINK_LIBRARIES( pthread ) +IF (NOT WIN32) + LINK_LIBRARIES( pthread ) ENDIF() ADD_EXECUTABLE(Test_Collision