VERY experimental Nintendo Switch 2 emulator
C++
cmake: prefer system simpleini library
Alexandre Bouvier67bbbabf8a6a
diff --git a/CMakeLists.txt b/CMakeLists.txtindex e5cac8fe94..ec7975b870 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -290,6 +290,7 @@ find_package(lz4 REQUIRED)find_package(nlohmann_json 3.8 REQUIRED)find_package(Opus 1.3 MODULE)find_package(RenderDoc MODULE)+find_package(SimpleIni MODULE)find_package(stb MODULE)find_package(VulkanMemoryAllocator CONFIG)find_package(ZLIB 1.2 REQUIRED)diff --git a/CMakeModules/FindSimpleIni.cmake b/CMakeModules/FindSimpleIni.cmakenew file mode 100644index 0000000000..ce75d76908--- /dev/null+++ b/CMakeModules/FindSimpleIni.cmake@@ -0,0 +1,19 @@+# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <[email protected]>+#+# SPDX-License-Identifier: GPL-3.0-or-later++find_path(SimpleIni_INCLUDE_DIR SimpleIni.h)++include(FindPackageHandleStandardArgs)+find_package_handle_standard_args(SimpleIni+ REQUIRED_VARS SimpleIni_INCLUDE_DIR+)++if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)+ add_library(SimpleIni::SimpleIni INTERFACE IMPORTED)+ set_target_properties(SimpleIni::SimpleIni PROPERTIES+ INTERFACE_INCLUDE_DIRECTORIES "${SimpleIni_INCLUDE_DIR}"+ )+endif()++mark_as_advanced(SimpleIni_INCLUDE_DIR)diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 515e3f2a4a..fc922c31b4 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -292,4 +292,6 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)endif()# SimpleIni-add_subdirectory(simpleini)+if (NOT TARGET SimpleIni::SimpleIni)+ add_subdirectory(simpleini)+endif()diff --git a/src/frontend_common/CMakeLists.txt b/src/frontend_common/CMakeLists.txtindex 1537271fc2..22e9337c4c 100644--- a/src/frontend_common/CMakeLists.txt+++ b/src/frontend_common/CMakeLists.txt@@ -7,4 +7,4 @@ add_library(frontend_common STATIC)create_target_directory_groups(frontend_common)-target_link_libraries(frontend_common PUBLIC core SimpleIni PRIVATE common Boost::headers)+target_link_libraries(frontend_common PUBLIC core SimpleIni::SimpleIni PRIVATE common Boost::headers)diff --git a/src/frontend_common/config.h b/src/frontend_common/config.hindex 20a1a8056b..b3812af17f 100644--- a/src/frontend_common/config.h+++ b/src/frontend_common/config.h@@ -7,6 +7,7 @@#include <string>#include "common/settings.h"+#define SI_NO_CONVERSION#include <SimpleIni.h>#include <boost/algorithm/string/replace.hpp>