1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From: Markus Koschany <apo@debian.org>
Date: Thu, 14 Jan 2016 15:43:35 +0100
Subject: do not build with embedded tinyxml library
Unbundle the embedded tinyxml library. Use Debian's version instead.
Forwarded: not-needed
---
.../BulletXmlWorldImporter/CMakeLists.txt | 23 +++++++++++++++-------
.../btBulletXmlWorldImporter.cpp | 2 +-
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
index 3a96062..540134e 100644
--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
+++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
@@ -10,19 +10,28 @@ ADD_LIBRARY(
btBulletXmlWorldImporter.h
string_split.cpp
string_split.h
- tinyxml.cpp
- tinyxml.h
- tinystr.cpp
- tinystr.h
- tinyxmlerror.cpp
- tinyxmlparser.cpp
)
+# Look for the header file.
+FIND_PATH(TINYXML_INCLUDE_DIR NAMES tinyxml.h)
+MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
+
+# Look for the library.
+FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml)
+MARK_AS_ADVANCED(TINYXML_LIBRARY)
+
+# all listed variables are TRUE
+INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXML DEFAULT_MSG TINYXML_LIBRARY TINYXML_INCLUDE_DIR)
+
+SET(TINYXML_LIBRARIES ${TINYXML_LIBRARY})
+SET(TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR})
+
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 tinyxml BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS)
IF (INSTALL_EXTRA_LIBS)
diff --git a/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp b/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
index e58dbc1..a1c7fb2 100644
--- a/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
+++ b/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
@@ -14,7 +14,7 @@ subject to the following restrictions:
*/
#include "btBulletXmlWorldImporter.h"
-#include "tinyxml.h"
+#include <tinyxml.h>
#include "btBulletDynamicsCommon.h"
#include "string_split.h"
|
