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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?=
<umlaeute@debian.org>
Date: Tue, 19 Mar 2024 12:19:19 +0100
Subject: use libpugixml-dev provided by the system
Origin: Debian
Forwarded: no
Last-Update: 2023-10-1
Last-Update: 2023-10-1
---
code/CMakeLists.txt | 26 +++++++++++++++-----------
test/CMakeLists.txt | 2 +-
2 files changed, 16 insertions(+), 12 deletions(-)
--- assimp.orig/code/CMakeLists.txt
+++ assimp/code/CMakeLists.txt
@@ -1115,19 +1115,19 @@
MESSAGE(STATUS "tinyusdz disabled")
ENDIF() # IF (ASSIMP_BUILD_USD_IMPORTER)
-# pugixml
-IF(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(pugixml)
- find_package(pugixml CONFIG REQUIRED)
-ELSEIF(NOT TARGET pugixml::pugixml)
- SET( Pugixml_SRCS
- ../contrib/pugixml/src/pugiconfig.hpp
- ../contrib/pugixml/src/pugixml.cpp
- ../contrib/pugixml/src/pugixml.hpp
- )
- INCLUDE_DIRECTORIES("../contrib/pugixml/src")
- SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
-ENDIF()
+## pugixml
+#IF(ASSIMP_HUNTER_ENABLED)
+# hunter_add_package(pugixml)
+# find_package(pugixml CONFIG REQUIRED)
+#ELSEIF(NOT TARGET pugixml::pugixml)
+# SET( Pugixml_SRCS
+# ../contrib/pugixml/src/pugiconfig.hpp
+# ../contrib/pugixml/src/pugixml.cpp
+# ../contrib/pugixml/src/pugixml.hpp
+# )
+# INCLUDE_DIRECTORIES("../contrib/pugixml/src")
+# SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
+#ENDIF()
# utf8
IF(ASSIMP_HUNTER_ENABLED)
@@ -1489,6 +1489,10 @@
$<INSTALL_INTERFACE:${ASSIMP_INCLUDE_INSTALL_DIR}>
)
+find_package(pugixml CONFIG REQUIRED)
+## the public header 'assimp/XmlParser.h' includes 'pugixml.hpp', so:
+TARGET_LINK_LIBRARIES(assimp PUBLIC pugixml)
+
IF(ASSIMP_HUNTER_ENABLED)
TARGET_LINK_LIBRARIES(assimp
PUBLIC
@@ -1512,9 +1516,6 @@
if (ASSIMP_BUILD_DRACO)
target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
endif()
- if(TARGET pugixml::pugixml)
- target_link_libraries(assimp pugixml::pugixml)
- endif()
ENDIF()
if(ASSIMP_ANDROID_JNIIOSYSTEM)
--- assimp.orig/test/CMakeLists.txt
+++ assimp/test/CMakeLists.txt
@@ -47,7 +47,7 @@
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/contrib/googletest/googletest/include
${Assimp_SOURCE_DIR}/contrib/googletest/googletest/
- ${Assimp_SOURCE_DIR}/contrib/pugixml/src
+ #${Assimp_SOURCE_DIR}/contrib/pugixml/src
)
endif()
|
