VERY experimental Nintendo Switch 2 emulator
C++
cmake: allow options shadowing with normal variables
Alexandre Bouvier37d8c9a305d7
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 55fdf8fccf..cf366c24f2 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -3,10 +3,6 @@cmake_minimum_required(VERSION 3.22)-# 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)-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/find-modules")diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 1b9ae00091..54e3d7c6d8 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -1,6 +1,10 @@# SPDX-FileCopyrightText: 2016 Citra Emulator Project# SPDX-License-Identifier: GPL-2.0-or-later+# 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)+list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules")list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules")include(DownloadExternals)@@ -12,8 +16,7 @@ endif()# Dynarmicif ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)- set(DYNARMIC_NO_BUNDLED_FMT ON)- set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)+ set(DYNARMIC_IGNORE_ASSERTS ON)add_subdirectory(dynarmic EXCLUDE_FROM_ALL)add_library(dynarmic::dynarmic ALIAS dynarmic)endif()@@ -60,10 +63,10 @@ if (YUZU_USE_EXTERNAL_SDL2)Locale Power Render)foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})string(TOUPPER ${_SUB} _OPT)- option(SDL_${_OPT} "" OFF)+ set(SDL_${_OPT} OFF)endforeach()- option(HIDAPI "" ON)+ set(HIDAPI ON)endif()set(SDL_STATIC ON)set(SDL_SHARED OFF)@@ -83,7 +86,7 @@ endif()# Cubebif (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb)- set(BUILD_TESTS OFF CACHE BOOL "")+ set(BUILD_TESTS OFF)add_subdirectory(cubeb EXCLUDE_FROM_ALL)add_library(cubeb::cubeb ALIAS cubeb)endif()@@ -98,6 +101,7 @@ endif()# Siritadd_subdirectory(sirit EXCLUDE_FROM_ALL)+# httplibif (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)if (NOT WIN32)find_package(OpenSSL 1.1)@@ -108,7 +112,7 @@ if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)if (WIN32 OR NOT OPENSSL_FOUND)# LibreSSL- set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")+ set(LIBRESSL_SKIP_INSTALL ON)set(OPENSSLDIR "/etc/ssl/")add_subdirectory(libressl EXCLUDE_FROM_ALL)target_include_directories(ssl INTERFACE ./libressl/include)@@ -118,7 +122,6 @@ if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)DEFINITION OPENSSL_LIBS)endif()- # httplibadd_library(httplib INTERFACE)target_include_directories(httplib INTERFACE ./cpp-httplib)target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)