From 432c3afe6c8a79e5019259f31ec97ecfa3918b94 Mon Sep 17 00:00:00 2001 From: wyc <1104749580@qq.com> Date: Thu, 13 Aug 2026 18:04:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96cmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- render_3D/CMakeLists.txt | 3 +++ render_3D/cmake/computer_graphics.cmake | 28 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/render_3D/CMakeLists.txt b/render_3D/CMakeLists.txt index 384a353..9c9b9ac 100644 --- a/render_3D/CMakeLists.txt +++ b/render_3D/CMakeLists.txt @@ -25,6 +25,9 @@ find_package(Vulkan REQUIRED) message(STATUS "${B}Vulkan_VERSION=${Vulkan_VERSION}${E}") find_package(PThreads4W REQUIRED) find_package(cglm CONFIG REQUIRED) +find_package(VulkanMemoryAllocator CONFIG REQUIRED) +find_package(msdf-atlas-gen CONFIG REQUIRED) +find_package(tinyobjloader CONFIG REQUIRED) if (RENDERIVE_BUILD_TESTS) find_package(GTest CONFIG REQUIRED) endif () diff --git a/render_3D/cmake/computer_graphics.cmake b/render_3D/cmake/computer_graphics.cmake index 15db4b6..d1cecf5 100644 --- a/render_3D/cmake/computer_graphics.cmake +++ b/render_3D/cmake/computer_graphics.cmake @@ -75,6 +75,7 @@ block() v1.12 ) rcl_get_effective_install_dir(render_3D::msdfgen MSDFGEN_ROOT) + set(MSDFGEN_CONFIG_DIR "${MSDFGEN_ROOT}/lib/cmake/msdfgen") rcl_cmake_library_set_cmake_options(render_3D::msdfgen ${msdfgen_cmake_option}) rcl_cmake_library_set_deps(render_3D::msdfgen global::zlib @@ -82,6 +83,17 @@ block() render_3D::freetype render_3D::tinyxml2 ) + rcl_cmake_library_set_other_use_opt(render_3D::msdfgen + "-Dmsdfgen_DIR=\"${MSDFGEN_CONFIG_DIR}\"" + ) + rcl_cmake_library_set_init_script(render_3D::msdfgen + "set(MSDFGEN_ROOT \"${MSDFGEN_ROOT}\")" + "set(msdfgen_DIR \"${MSDFGEN_CONFIG_DIR}\")" + ) + rcl_cmake_library_set_clear_script(render_3D::msdfgen + "unset(MSDFGEN_ROOT)" + "unset(msdfgen_DIR)" + ) set(msdfgl_cmake_option "") if (WIN32) set(PThreads4W_option ${base_options}) @@ -121,6 +133,8 @@ block() v1.4 ) rcl_get_effective_install_dir(render_3D::msdf-atlas-gen MSDF_ATLAS_GEN_ROOT) + set(MSDF_ATLAS_GEN_CONFIG_DIR "${MSDF_ATLAS_GEN_ROOT}/lib/cmake/msdf-atlas-gen") + set(MSDF_ATLAS_GEN_MSDFGEN_CONFIG_DIR "${MSDF_ATLAS_GEN_ROOT}/lib/cmake/msdfgen") rcl_cmake_library_set_cmake_options(render_3D::msdf-atlas-gen ${msdf-atlas-gen_option}) rcl_cmake_library_set_deps(render_3D::msdf-atlas-gen global::zlib @@ -128,6 +142,20 @@ block() render_3D::freetype render_3D::tinyxml2 ) + rcl_cmake_library_set_other_use_opt(render_3D::msdf-atlas-gen + "-Dmsdf-atlas-gen_DIR=\"${MSDF_ATLAS_GEN_CONFIG_DIR}\"" + "-Dmsdfgen_DIR=\"${MSDF_ATLAS_GEN_MSDFGEN_CONFIG_DIR}\"" + ) + rcl_cmake_library_set_init_script(render_3D::msdf-atlas-gen + "set(MSDF_ATLAS_GEN_ROOT \"${MSDF_ATLAS_GEN_ROOT}\")" + "set(msdf-atlas-gen_DIR \"${MSDF_ATLAS_GEN_CONFIG_DIR}\")" + "set(msdfgen_DIR \"${MSDF_ATLAS_GEN_MSDFGEN_CONFIG_DIR}\")" + ) + rcl_cmake_library_set_clear_script(render_3D::msdf-atlas-gen + "unset(MSDF_ATLAS_GEN_ROOT)" + "unset(msdf-atlas-gen_DIR)" + "unset(msdfgen_DIR)" + ) set(cglm_option ${base_options}) _register_git_cmake_library(render_3D::cglm "https://github.com/recp/cglm.git"