From affab2a483321f44e74123402d962557605f3513 Mon Sep 17 00:00:00 2001 From: crueter Date: Wed, 13 Aug 2025 18:14:11 -0400 Subject: [PATCH] [cmake] fix fmt, z{lib,std} install Signed-off-by: crueter --- CMakeLists.txt | 11 ++++++----- src/dynarmic/externals/CMakeLists.txt | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fcd9efad5f..0990152e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,6 +451,8 @@ if (YUZU_USE_CPM) SHA 40626af88b HASH d59f06c24339f223de4ec2afeba1c67b5835a0f350a1ffa86242a72fc3e616a6b8b21798355428d4200c75287308b66634619ffa0b52ba5bd74cc01772ea1a8a VERSION 8 + OPTIONS + "FMT_INSTALL OFF" ) AddPackage( @@ -478,6 +480,7 @@ if (YUZU_USE_CPM) REPO brofield/simpleini SHA 09c21bda1d HASH 99779ca9b6e040d36558cadf484f9ffdab5b47bcc8fc72e4d33639d1d60c0ceb4410d335ba445d72a4324e455167fd6769d99b459943aa135bec085dff2d4b7c + EXCLUDE_FROM_ALL ON ) AddPackage( @@ -489,6 +492,7 @@ if (YUZU_USE_CPM) OPTIONS "ZLIB_BUILD_SHARED OFF" "ZLIB_INSTALL OFF" + EXCLUDE_FROM_ALL ON ) if (ZLIB_ADDED) @@ -502,13 +506,10 @@ if (YUZU_USE_CPM) SHA f8745da6ff HASH 3037007f990040fe32573b46f9bef8762fd5dbeeb07ffffcbfeba51ec98167edae39bb9c87f9299efcd61c4e467c5e84f7c19f0df7799bc1fc04864a278792ee VERSION 1.5 - DOWNLOAD_ONLY YES + SOURCE_SUBDIR build/cmake + EXCLUDE_FROM_ALL ON ) - if (zstd_ADDED) - add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR}) - endif() - if (YUZU_TESTS OR DYNARMIC_TESTS) AddPackage( NAME Catch2 diff --git a/src/dynarmic/externals/CMakeLists.txt b/src/dynarmic/externals/CMakeLists.txt index b225602f97..072558a618 100644 --- a/src/dynarmic/externals/CMakeLists.txt +++ b/src/dynarmic/externals/CMakeLists.txt @@ -103,6 +103,7 @@ if ("x86_64" IN_LIST ARCHITECTURE) HASH 15aa399f39713e042c4345bc3175c82f14dca849fde2a21d4f591f62c43e227b70d868d8bb86beb5f4eb68b1d6bd3792cdd638acf89009e787e3d10ee7401924 OPTIONS "CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON" + EXCLUDE_FROM_ALL ON SYSTEM_PACKAGE OFF ) @@ -119,5 +120,6 @@ if ("x86_64" IN_LIST ARCHITECTURE) "ZYDIS_BUILD_DOXYGEN OFF" "ZYAN_SYSTEM_ZYCORE ON" "CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON" + EXCLUDE_FROM_ALL ON ) endif()