Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-10-17 22:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Use Threads instead of pthread directly

Browse Source 
On some systems, such as Android, threads are not provided via
`-lpthread`.

CMake comes with a built-in module for finding the correct threads
library.

Use it to fix the linking issue on Android and possibly other systems.
This commit is contained in:
Gleb Mazovetskiy
2021-01-20 02:16:51 +00:00
parent 48514d038b
commit 6442613ba6
8 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -252,7 +252,8 @@ IF(BULLET2_MULTITHREADING)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ENDIF (NOT MSVC)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF (NOT WIN32)
ENDIF (BULLET2_MULTITHREADING)

3
Extras/BulletRobotics/CMakeLists.txt
View File

@@ -180,7 +180,8 @@ ELSE(WIN32)
ENDIF(BUILD_CLSOCKET)
IF(NOT APPLE)
LINK_LIBRARIES( pthread ${DL} )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} ${DL} )
ENDIF(NOT APPLE)
ENDIF(WIN32)

3
Extras/BulletRoboticsGUI/CMakeLists.txt
View File

@@ -146,7 +146,8 @@ ELSE(WIN32)
ENDIF(BUILD_CLSOCKET)
IF(NOT APPLE)
LINK_LIBRARIES( pthread ${DL} )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} ${DL} )
ENDIF(NOT APPLE)
ENDIF(WIN32)

3
test/BulletDynamics/CMakeLists.txt
View File

@@ -10,7 +10,8 @@ ADD_DEFINITIONS(-D_VARIADIC_MAX=10)
LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath gtest)
IF (NOT WIN32)
LINK_LIBRARIES(pthread)
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()
ADD_EXECUTABLE(Test_btKinematicCharacterController test_btKinematicCharacterController.cpp)

3
test/BulletDynamics/pendulum/CMakeLists.txt
View File

@@ -14,7 +14,8 @@ LINK_LIBRARIES(
)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()
ADD_EXECUTABLE(Test_BulletDynamics

12
test/InverseDynamics/CMakeLists.txt
View File

@@ -17,7 +17,8 @@ IF (BULLET_BUILD_RBDL_COMPARE_TEST)
LINK_LIBRARIES( BulletDynamics BulletCollision Bullet3Common LinearMath gtest rbdl_urdfreader rbdl)
ENDIF (MSVC)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()
@@ -81,7 +82,8 @@ LINK_LIBRARIES(
BulletInverseDynamicsUtils BulletInverseDynamics Bullet3Common LinearMath gtest
)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()
@@ -113,7 +115,8 @@ LINK_LIBRARIES(
BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics Bullet3Common LinearMath gtest
)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()
@@ -176,7 +179,8 @@ LINK_LIBRARIES(
BulletInverseDynamicsUtils BulletInverseDynamics Bullet3Common LinearMath gtest
)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()

3
test/SharedMemory/CMakeLists.txt
View File

@@ -20,7 +20,8 @@ LINK_LIBRARIES(
)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
IF (NOT APPLE)
LINK_LIBRARIES(${DL})
ENDIF()

3
test/collision/CMakeLists.txt
View File

@@ -14,7 +14,8 @@ LINK_LIBRARIES(
)
IF (NOT WIN32)
LINK_LIBRARIES( pthread )
FIND_PACKAGE(Threads)
LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
ENDIF()
ADD_EXECUTABLE(Test_Collision