73 lines
3.3 KiB
Diff
73 lines
3.3 KiB
Diff
diff -up ./CMakeLists.txt.tinyxml ./CMakeLists.txt
|
|
--- ./CMakeLists.txt.tinyxml 2017-09-29 19:20:39.000000000 -0400
|
|
+++ ./CMakeLists.txt 2017-11-28 19:14:12.377026680 -0500
|
|
@@ -324,6 +324,8 @@ OPTION(BUILD_PYBULLET "Set when you want
|
|
OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON)
|
|
OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON)
|
|
|
|
+include(FindPkgConfig)
|
|
+pkg_check_modules(tinyxml REQUIRED tinyxml)
|
|
|
|
IF(BUILD_PYBULLET)
|
|
FIND_PACKAGE(PythonLibs)
|
|
diff -up ./Extras/BulletRobotics/CMakeLists.txt.tinyxml ./Extras/BulletRobotics/CMakeLists.txt
|
|
--- ./Extras/BulletRobotics/CMakeLists.txt.tinyxml 2017-09-29 19:20:39.000000000 -0400
|
|
+++ ./Extras/BulletRobotics/CMakeLists.txt 2017-11-28 19:14:12.377026680 -0500
|
|
@@ -1,5 +1,6 @@
|
|
|
|
INCLUDE_DIRECTORIES(
|
|
+ ${tinyxml_INCLUDE_DIRS}
|
|
${BULLET_PHYSICS_SOURCE_DIR}/src
|
|
${BULLET_PHYSICS_SOURCE_DIR}/examples
|
|
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
|
|
@@ -59,11 +60,6 @@ SET(BulletRobotics_SRCS
|
|
../../examples/Utils/b3ReferenceFrameHelper.hpp
|
|
../../examples/Utils/ChromeTraceUtil.cpp
|
|
|
|
- ../../examples/ThirdPartyLibs/tinyxml/tinystr.cpp
|
|
- ../../examples/ThirdPartyLibs/tinyxml/tinyxml.cpp
|
|
- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
|
|
- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
|
|
-
|
|
../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
|
|
../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h
|
|
|
|
@@ -162,7 +158,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PRO
|
|
SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION})
|
|
|
|
IF (BUILD_SHARED_LIBS)
|
|
- TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
|
|
+ TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common ${tinyxml_LIBRARIES})
|
|
ENDIF (BUILD_SHARED_LIBS)
|
|
|
|
IF (INSTALL_EXTRA_LIBS)
|
|
diff -up ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
|
--- ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml 2017-11-28 19:15:57.409991121 -0500
|
|
+++ ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt 2017-11-28 19:16:25.840981495 -0500
|
|
@@ -1,4 +1,5 @@
|
|
INCLUDE_DIRECTORIES(
|
|
+ ${tinyxml_INCLUDE_DIRS}
|
|
${BULLET_PHYSICS_SOURCE_DIR}/src
|
|
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
|
|
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
|
|
@@ -10,19 +11,13 @@ ADD_LIBRARY(
|
|
btBulletXmlWorldImporter.h
|
|
string_split.cpp
|
|
string_split.h
|
|
- tinyxml.cpp
|
|
- tinyxml.h
|
|
- tinystr.cpp
|
|
- tinystr.h
|
|
- tinyxmlerror.cpp
|
|
- tinyxmlparser.cpp
|
|
)
|
|
|
|
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
|
|
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 ${tinyxml_LIBRARIES})
|
|
ENDIF (BUILD_SHARED_LIBS)
|
|
|
|
IF (INSTALL_EXTRA_LIBS)
|