From: Timo Röhling Date: Fri, 19 Aug 2022 18:59:52 +0000 (+0200) Subject: Stop using the deprecated DRACO_LIBRARIES variable X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~50 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba561fc046a4aca5e85f13b43f181a528f2b8436;p=filament.git Stop using the deprecated DRACO_LIBRARIES variable --- diff --git a/debian/patches/0009-Fix-library-export-for-Debian.patch b/debian/patches/0009-Fix-library-export-for-Debian.patch index bff21de..15c1757 100644 --- a/debian/patches/0009-Fix-library-export-for-Debian.patch +++ b/debian/patches/0009-Fix-library-export-for-Debian.patch @@ -745,7 +745,7 @@ index 37db5a9..dd13c29 100644 + target_link_libraries(test_transcoder PRIVATE ${TARGET} GTest::gtest) endif() diff --git a/libs/gltfio/CMakeLists.txt b/libs/gltfio/CMakeLists.txt -index b759b0b..1f6ed14 100644 +index b759b0b..a28e76e 100644 --- a/libs/gltfio/CMakeLists.txt +++ b/libs/gltfio/CMakeLists.txt @@ -106,6 +106,12 @@ set(DUMMY_SRC "${RESOURCE_DIR}/dummy.c") @@ -792,7 +792,7 @@ index b759b0b..1f6ed14 100644 +) +target_compile_features(gltfio_core PUBLIC cxx_std_17) +target_compile_definitions(gltfio_core PRIVATE -DGLTFIO_DRACO_SUPPORTED=1) -+target_link_libraries(gltfio_core PRIVATE ${DRACO_LIBRARIES}) ++target_link_libraries(gltfio_core PRIVATE draco::draco) +target_link_libraries(gltfio_core PRIVATE filament::math filament::utils filament::filament cgltf filament::stb filament::geometry filament::gltfio_resources tsl::robin_map trie) +set_target_properties(gltfio_core PROPERTIES + OUTPUT_NAME "filament_gltfio_core"