Merge pull request #2055 from xantares/pybullet

Pybullet enhancements

examples/ExampleBrowser/CMakeLists.txt

@@ -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

examples/OpenGLWindow/CMakeLists.txt

@@ -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})

examples/ThirdPartyLibs/BussIK/CMakeLists.txt

@@ -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})

examples/ThirdPartyLibs/Gwen/CMakeLists.txt

@@ -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})

examples/pybullet/CMakeLists.txt

@@ -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})