summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47bd282fb..4bf55d664 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,8 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
35 35
36option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON) 36option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)
37 37
38option(YUZU_TESTS "Compile tests" ON)
39
38# Default to a Release build 40# Default to a Release build
39get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) 41get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
40if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) 42if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
@@ -168,7 +170,6 @@ macro(yuzu_find_packages)
168 # Capitalization matters here. We need the naming to match the generated paths from Conan 170 # Capitalization matters here. We need the naming to match the generated paths from Conan
169 set(REQUIRED_LIBS 171 set(REQUIRED_LIBS
170 # Cmake Pkg Prefix Version Conan Pkg 172 # Cmake Pkg Prefix Version Conan Pkg
171 "Catch2 2.13.7 catch2/2.13.7"
172 "fmt 8.0.1 fmt/8.1.1" 173 "fmt 8.0.1 fmt/8.1.1"
173 "lz4 1.8 lz4/1.9.2" 174 "lz4 1.8 lz4/1.9.2"
174 "nlohmann_json 3.8 nlohmann_json/3.8.0" 175 "nlohmann_json 3.8 nlohmann_json/3.8.0"
@@ -177,6 +178,11 @@ macro(yuzu_find_packages)
177 # can't use opus until AVX check is fixed: https://github.com/yuzu-emu/yuzu/pull/4068 178 # can't use opus until AVX check is fixed: https://github.com/yuzu-emu/yuzu/pull/4068
178 #"opus 1.3 opus/1.3.1" 179 #"opus 1.3 opus/1.3.1"
179 ) 180 )
181 if (YUZU_TESTS)
182 list(APPEND REQUIRED_LIBS
183 "Catch2 2.13.7 catch2/2.13.7"
184 )
185 endif()
180 186
181 foreach(PACKAGE ${REQUIRED_LIBS}) 187 foreach(PACKAGE ${REQUIRED_LIBS})
182 string(REGEX REPLACE "[ \t\r\n]+" ";" PACKAGE_SPLIT ${PACKAGE}) 188 string(REGEX REPLACE "[ \t\r\n]+" ";" PACKAGE_SPLIT ${PACKAGE})