From eca50067793dd8e0dcd1cf5a112d5d12071f0946 Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 2 Aug 2025 15:18:29 -0400 Subject: [PATCH] [dynarmic] include catch2 and oaknut properly for tests Signed-off-by: crueter --- externals/CMakeLists.txt | 2 +- src/dynarmic/externals/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 054008ed6d..1b1f5daaf3 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -32,7 +32,7 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) endif() # Oaknut (also used by Dynarmic, so needs to be added first) -if (ARCHITECTURE_arm64) +if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS) CPMAddPackage( NAME oaknut VERSION 2.0.1 diff --git a/src/dynarmic/externals/CMakeLists.txt b/src/dynarmic/externals/CMakeLists.txt index b5b77b83af..a27ede7033 100644 --- a/src/dynarmic/externals/CMakeLists.txt +++ b/src/dynarmic/externals/CMakeLists.txt @@ -35,7 +35,7 @@ endif() # TODO(crueter): dedup if (NOT TARGET Catch2::Catch2WithMain) if (DYNARMIC_TESTS) - add_subdirectory(catch EXCLUDE_FROM_ALL) + find_package(Catch2 3.0.1 REQUIRED) endif() endif()