blob: ee5e5c8d315f67b3cd0258ba0b052f3ba97a75df (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -786,6 +786,10 @@ add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
-DBOOST_REGEX_NO_LIB
)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(inih REQUIRED IMPORTED_TARGET INIReader)
+add_library(inih ALIAS PkgConfig::inih)
+
enable_testing()
add_subdirectory(externals)
add_subdirectory(src)
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -30,9 +30,6 @@ endif()
# Glad
add_subdirectory(glad)
-# inih
-add_subdirectory(inih)
-
# mbedtls
add_subdirectory(mbedtls EXCLUDE_FROM_ALL)
target_include_directories(mbedtls PUBLIC ./mbedtls/include)
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -15,7 +15,7 @@
#pragma clang diagnostic pop
#endif
-#include <inih/cpp/INIReader.h>
+#include <INIReader.h>
#include "common/fs/file.h"
#include "common/fs/fs.h"
#include "common/fs/path_util.h"
|