From 778a023a24d64e285e5f875f030aef0ca6adc854 Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 2 Aug 2025 23:03:31 -0400 Subject: [PATCH] [externals] Explicitly capture DYNARMIC_TESTS prior to initial call Signed-off-by: crueter --- externals/CMakeLists.txt | 3 +++ externals/nx_tzdb/CMakeLists.txt | 1 + src/dynarmic/CMakeLists.txt | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fa435399fe..16787387db 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -7,6 +7,9 @@ # cpm include(CPM) +# Explicitly declare this option here to propagate to the oaknut CPM call +option(DYNARMIC_TESTS "Build tests" ${BUILD_TESTING}) + # Dynarmic has cmake_minimum_required(3.12) and we may want to override # some of its variables, which is only possible in 3.13+ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) diff --git a/externals/nx_tzdb/CMakeLists.txt b/externals/nx_tzdb/CMakeLists.txt index 327ed7886a..a86a97b4da 100644 --- a/externals/nx_tzdb/CMakeLists.txt +++ b/externals/nx_tzdb/CMakeLists.txt @@ -49,6 +49,7 @@ if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_ DESTINATION ${NX_TZDB_ROMFS_DIR}) elseif (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA) + # TODO(crueter): this sucked to do with cpm, see if i can get it to work again add_subdirectory(tzdb_to_nx) add_dependencies(nx_tzdb x80e) diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt index 3fcd01406c..a5d8628ae0 100644 --- a/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/CMakeLists.txt @@ -17,7 +17,6 @@ option(DYNARMIC_ENABLE_CPU_FEATURE_DETECTION "Turning this off causes dynarmic t option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" OFF) option(DYNARMIC_FATAL_ERRORS "Errors are fatal" OFF) option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF) -option(DYNARMIC_TESTS "Build tests" ${BUILD_TESTING}) option(DYNARMIC_TESTS_USE_UNICORN "Enable fuzzing tests against unicorn" OFF) option(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF) option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)