diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-01-23 00:22:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-23 00:22:47 +0100 |
| commit | f99f618d45ad862c4bc23fc28c91d1c48218a3cb (patch) | |
| tree | ec7b1205207b6c177af1bad768119e713b30138d /CMakeLists.txt | |
| parent | Merge pull request #9660 from german77/koreaToTaiwan (diff) | |
| parent | cmake: support the standard cmake testing option (diff) | |
| download | yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.tar yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.tar.gz yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.tar.bz2 yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.tar.lz yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.tar.xz yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.tar.zst yuzu-f99f618d45ad862c4bc23fc28c91d1c48218a3cb.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cee720940..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) @@ -242,7 +244,7 @@ if (ENABLE_WEB_SERVICE) endif() if (YUZU_TESTS) - find_package(Catch2 2.13.7 REQUIRED) + find_package(Catch2 3.0.1 REQUIRED) endif() find_package(Boost 1.73.0 COMPONENTS context) @@ -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) |