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

Merge pull request #2055 from xantares/pybullet

Browse Source 
Pybullet enhancements
This commit is contained in:
erwincoumans
2019-02-10 20:25:47 -08:00
committed by GitHub
parent 1118542d0e e793bd22bb
commit b574a360f5
5 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -71,6 +71,11 @@ IF (BUILD_SHARED_LIBS)
ENDIF(WIN32)
ENDIF(BUILD_SHARED_LIBS)
INSTALL(TARGETS BulletExampleBrowserLib
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})
####################
#
# Bullet Example Browser main app

5
examples/OpenGLWindow/CMakeLists.txt
View File

@@ -73,3 +73,8 @@ if (BUILD_SHARED_LIBS)
endif()
#target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY})
INSTALL(TARGETS OpenGLWindow
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})

5
examples/ThirdPartyLibs/BussIK/CMakeLists.txt
View File

@@ -8,3 +8,8 @@ FILE(GLOB BussIK_SRCS "*.cpp" )
FILE(GLOB BussIK_HDRS "*.h" )
ADD_LIBRARY(BussIK ${BussIK_SRCS} ${BussIK_HDRS})
INSTALL(TARGETS BussIK
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})

6
examples/ThirdPartyLibs/Gwen/CMakeLists.txt
View File

@@ -26,3 +26,9 @@ IF(WIN32 OR APPLE)
target_link_libraries(gwen ${OPENGL_gl_LIBRARY})
ENDIF()
ENDIF()
INSTALL(TARGETS gwen
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})

19
examples/pybullet/CMakeLists.txt
View File

@@ -163,9 +163,26 @@ IF(WIN32)
SET_TARGET_PROPERTIES(pybullet PROPERTIES SUFFIX ".pyd" )
ENDIF(WIN32)
IF (APPLE)
SET_TARGET_PROPERTIES(pybullet PROPERTIES SUFFIX ".so" )
ENDIF()
TARGET_LINK_LIBRARIES(pybullet BulletExampleBrowserLib BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen BussIK Bullet3Common ${PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(pybullet BulletExampleBrowserLib BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen BussIK Bullet3Common)
IF (WIN32)
TARGET_LINK_LIBRARIES(pybullet ${PYTHON_LIBRARIES})
ELSEIF (APPLE)
SET_TARGET_PROPERTIES(pybullet PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
ENDIF ()
# else Linux: dont link
IF(WIN32)
SET(PYTHON_SITE_PACKAGES Lib/site-packages CACHE PATH "Python install path")
ELSE()
SET(PYTHON_SITE_PACKAGES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE PATH "Python install path")
ENDIF()
INSTALL(TARGETS pybullet DESTINATION ${PYTHON_SITE_PACKAGES})