diff options
| author | Alexandre Bouvier <contact@amb.tf> | 2023-01-05 05:00:44 +0100 |
|---|---|---|
| committer | Alexandre Bouvier <contact@amb.tf> | 2023-01-05 05:03:34 +0100 |
| commit | 7a2bd13f5bf00153fc543daa779c1037ecbe4298 (patch) | |
| tree | b7911b75d3742ea366376d73f95e020d6ec018a6 | |
| parent | tests: update catch2 to 3.0.1 (diff) | |
| download | yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.tar yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.tar.gz yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.tar.bz2 yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.tar.lz yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.tar.xz yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.tar.zst yuzu-7a2bd13f5bf00153fc543daa779c1037ecbe4298.zip | |
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 658a2816b..f91ba950a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,14 @@ cmake_minimum_required(VERSION 3.22) +project(yuzu) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") + include(DownloadExternals) include(CMakeDependentOption) - -project(yuzu) +include(CTest) # Set bundled sdl2/qt as dependent options. # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON @@ -42,7 +44,7 @@ option(ENABLE_CUBEB "Enables the cubeb audio backend" ON) option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) -option(YUZU_TESTS "Compile tests" ON) +option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}") option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) @@ -606,7 +608,6 @@ if (YUZU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() endif() -enable_testing() add_subdirectory(externals) add_subdirectory(src) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index dfd40cba6..291ef96ee 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -5,6 +5,9 @@ # some of its variables, which is only possible in 3.13+ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +# Disable tests in all externals supporting the standard option name +set(BUILD_TESTING OFF) + # xbyak if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) add_subdirectory(xbyak EXCLUDE_FROM_ALL) |