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
|
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 libdraco-dev provided by the system
Origin: Debian
Forwarded: no
Last-Update: 2021-11-23
Last-Update: 2021-11-23
---
code/CMakeLists.txt | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- assimp.orig/code/CMakeLists.txt
+++ assimp/code/CMakeLists.txt
@@ -1392,9 +1392,13 @@
ENDIF ()
IF (ASSIMP_BUILD_DRACO)
- INCLUDE_DIRECTORIES(${draco_INCLUDE_DIRS})
- ADD_DEFINITIONS( -DASSIMP_ENABLE_DRACO )
+ #INCLUDE_DIRECTORIES(${draco_INCLUDE_DIRS})
+ #ADD_DEFINITIONS( -DASSIMP_ENABLE_DRACO )
ENDIF()
+find_package(draco CONFIG REQUIRED)
+set(draco_LIBRARIES "draco::draco")
+set(ASSIMP_BUILD_DRACO 1)
+
ADD_LIBRARY( assimp ${assimp_src} )
ADD_LIBRARY(assimp::assimp ALIAS assimp)
@@ -1506,7 +1510,7 @@
ELSE()
TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
if (ASSIMP_BUILD_DRACO)
- target_link_libraries(assimp ${draco_LIBRARIES})
+ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
endif()
if(TARGET pugixml::pugixml)
target_link_libraries(assimp pugixml::pugixml)
|
