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
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
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 rapidjson-dev provided by the system
Origin: Debian
Forwarded: no
Last-Update: 2023-10-20
Last-Update: 2023-10-20
---
code/CMakeLists.txt | 25 ++++++++++++++-----------
test/CMakeLists.txt | 25 +++++++++++++------------
2 files changed, 27 insertions(+), 23 deletions(-)
--- assimp.orig/code/CMakeLists.txt
+++ assimp/code/CMakeLists.txt
@@ -1286,17 +1286,17 @@
ENDIF ()
# RapidJSON
-IF(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(RapidJSON)
- find_package(RapidJSON CONFIG REQUIRED)
-ELSE()
- INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
- ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
- option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
- if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
- ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
- endif()
-ENDIF()
+#IF(ASSIMP_HUNTER_ENABLED)
+# hunter_add_package(RapidJSON)
+# find_package(RapidJSON CONFIG REQUIRED)
+#ELSE()
+# INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
+# ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
+# option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
+# if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
+# ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
+# endif()
+#ENDIF()
# stb
#IF(ASSIMP_HUNTER_ENABLED)
@@ -1493,6 +1493,9 @@
## the public header 'assimp/XmlParser.h' includes 'pugixml.hpp', so:
TARGET_LINK_LIBRARIES(assimp PUBLIC pugixml)
+FIND_PACKAGE(RapidJSON CONFIG REQUIRED)
+TARGET_COMPILE_DEFINITIONS(assimp PRIVATE RAPIDJSON_HAS_STDSTRING=1)
+
IF(ASSIMP_HUNTER_ENABLED)
TARGET_LINK_LIBRARIES(assimp
PUBLIC
--- assimp.orig/test/CMakeLists.txt
+++ assimp/test/CMakeLists.txt
@@ -114,7 +114,7 @@
unit/utLWOImportExport.cpp
unit/utSMDImportExport.cpp
unit/utglTFImportExport.cpp
- unit/utglTF2ImportExport.cpp
+ #unit/utglTF2ImportExport.cpp
unit/utHMPImportExport.cpp
unit/utIFCImportExport.cpp
unit/utFBXImporterExporter.cpp
@@ -243,17 +243,18 @@
endif()
# RapidJSON
-IF(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(RapidJSON)
- find_package(RapidJSON CONFIG REQUIRED)
-ELSE()
- INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
- ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
- option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
- if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
- ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
- endif()
-ENDIF()
+#IF(ASSIMP_HUNTER_ENABLED)
+# hunter_add_package(RapidJSON)
+# find_package(RapidJSON CONFIG REQUIRED)
+#ELSE()
+# INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
+# ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
+# option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
+# if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
+# ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
+# endif()
+#ENDIF()
+FIND_PACKAGE(RapidJSON CONFIG REQUIRED)
IF (ASSIMP_BUILD_DRACO)
ADD_DEFINITIONS( -DASSIMP_ENABLE_DRACO )
|
