From: Timo Röhling Date: Sat, 4 May 2024 18:49:11 +0000 (+0200) Subject: Build against system libraries X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~22 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7ef1a0cbeeec8981077a74df24439220bbf7a10;p=filament.git Build against system libraries Gbp-Pq: Name 0001-Build-against-system-libraries.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index aa51851..c513cea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -573,12 +573,30 @@ function(get_resgen_vars ARCHIVE_DIR ARCHIVE_NAME) endif() endfunction() +# ================================================================================================== +# External dependencies +# ================================================================================================== +find_package(GTest REQUIRED) +find_package(astcenc REQUIRED) +find_package(tsl-robin-map REQUIRED) +find_package(meshoptimizer REQUIRED) +find_package(draco REQUIRED) +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) +if(IS_HOST_PLATFORM) + find_package(PNG REQUIRED) + find_package(SDL2 REQUIRED) + find_package(ZLIB REQUIRED) + find_package(tinyexr REQUIRED) +endif() +include(debian/cmake/imgui.cmake) +include(debian/cmake/stb.cmake) + # ================================================================================================== # Sub-projects # ================================================================================================== # Common to all platforms -add_subdirectory(${EXTERNAL}/libgtest/tnt) add_subdirectory(${LIBRARIES}/camutils) add_subdirectory(${LIBRARIES}/filabridge) add_subdirectory(${LIBRARIES}/filaflat) @@ -597,15 +615,10 @@ add_subdirectory(${FILAMENT}/filament) add_subdirectory(${FILAMENT}/shaders) add_subdirectory(${EXTERNAL}/civetweb/tnt) add_subdirectory(${EXTERNAL}/hat-trie/tnt) -add_subdirectory(${EXTERNAL}/imgui/tnt) -add_subdirectory(${EXTERNAL}/robin-map/tnt) add_subdirectory(${EXTERNAL}/smol-v/tnt) -add_subdirectory(${EXTERNAL}/benchmark/tnt) -add_subdirectory(${EXTERNAL}/meshoptimizer) +include(debian/cmake/benchmark.cmake) add_subdirectory(${EXTERNAL}/cgltf/tnt) -add_subdirectory(${EXTERNAL}/draco/tnt) -add_subdirectory(${EXTERNAL}/jsmn/tnt) -add_subdirectory(${EXTERNAL}/stb/tnt) +include(debian/cmake/jsmn.cmake) add_subdirectory(${EXTERNAL}/getopt) if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM) @@ -649,13 +662,8 @@ if (IS_HOST_PLATFORM) add_subdirectory(${FILAMENT}/samples) - add_subdirectory(${EXTERNAL}/astcenc/tnt) add_subdirectory(${EXTERNAL}/etc2comp) - add_subdirectory(${EXTERNAL}/libassimp/tnt) - add_subdirectory(${EXTERNAL}/libpng/tnt) - add_subdirectory(${EXTERNAL}/libsdl2/tnt) - add_subdirectory(${EXTERNAL}/libz/tnt) - add_subdirectory(${EXTERNAL}/tinyexr/tnt) + include(debian/cmake/libassimp.cmake) add_subdirectory(${TOOLS}/cmgen) add_subdirectory(${TOOLS}/cso-lut)