From da61fa7bea5016ec5f00c99e2061862d072294d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20R=C3=B6hling?= Date: Sat, 23 Oct 2021 19:17:07 +0200 Subject: [PATCH] Build against system libraries Gbp-Pq: Name 0001-Build-against-system-libraries.patch --- CMakeLists.txt | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa51851..b82a941 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -573,12 +573,25 @@ function(get_resgen_vars ARCHIVE_DIR ARCHIVE_NAME) endif() endfunction() +# ================================================================================================== +# External dependencies +# ================================================================================================== +find_package(GTest REQUIRED) +find_package(tsl-robin-map REQUIRED) +find_package(meshoptimizer REQUIRED) +find_package(draco REQUIRED) +if(IS_HOST_PLATFORM) + find_package(PNG REQUIRED) + find_package(SDL2 REQUIRED) + find_package(ZLIB REQUIRED) + find_package(tinyexr REQUIRED) +endif() + # ================================================================================================== # Sub-projects # ================================================================================================== # Common to all platforms -add_subdirectory(${EXTERNAL}/libgtest/tnt) add_subdirectory(${LIBRARIES}/camutils) add_subdirectory(${LIBRARIES}/filabridge) add_subdirectory(${LIBRARIES}/filaflat) @@ -597,22 +610,17 @@ 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) +include(debian/cmake/imgui.cmake) 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) +include(debian/cmake/stb.cmake) add_subdirectory(${EXTERNAL}/getopt) if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM) - # spirv-tools must come before filamat, as filamat relies on the presence of the - # spirv-tools_SOURCE_DIR variable. - add_subdirectory(${EXTERNAL}/spirv-tools) - add_subdirectory(${EXTERNAL}/glslang/tnt) + include(debian/cmake/spirv-tools.cmake) + include(debian/cmake/glslang.cmake) add_subdirectory(${EXTERNAL}/spirv-cross/tnt) add_subdirectory(${LIBRARIES}/filamat) @@ -651,11 +659,7 @@ if (IS_HOST_PLATFORM) 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) -- 2.30.2