diff options
| author | liamwhite <[email protected]> | 2023-01-02 11:29:32 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-02 11:29:32 -0500 |
| commit | 2b110d61e7723081b47417834085c6fa0ddfc3c6 (patch) | |
| tree | 7315d913b9b58316e7ad39c00c18ed9829558f7f | |
| parent | 6804a43f4958846352ef14cecf2f2d9d22d127f0 (diff) | |
| parent | 306c791e67ca6c0f991490d6dd4d57b469f69677 (diff) | |
| download | yuzu-mainline-2b110d61e7723081b47417834085c6fa0ddfc3c6.tar.gz yuzu-mainline-2b110d61e7723081b47417834085c6fa0ddfc3c6.zip | |
Merge pull request #9541 from abouvier/cmake-option
cmake: allow options shadowing with normal variables
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45e6bd761..ed22187fd 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.txt index 1b9ae0009..54e3d7c6d 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() # Dynarmic if ((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() # Cubeb if (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() # Sirit add_subdirectory(sirit EXCLUDE_FROM_ALL) +# httplib if (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() - # httplib add_library(httplib INTERFACE) target_include_directories(httplib INTERFACE ./cpp-httplib) target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) |