diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-26 09:49:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-26 09:49:43 -0500 |
| commit | c100d7e802b6a5d2f6b21d9f4bbe4b155a7d576b (patch) | |
| tree | 4ed2177c84a560455cbc7dcc78e17dae476b2877 /src | |
| parent | 83aa66b17ddc9b5cfce1e76639648af3909efdc9 (diff) | |
| parent | fe3702223f0d5c2bd36a3d4d98c423157f422c10 (diff) | |
Merge pull request #12175 from abouvier/unbundle-simpleini
cmake: prefer system simpleini library
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontend_common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/frontend_common/config.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/frontend_common/CMakeLists.txt b/src/frontend_common/CMakeLists.txt index 1537271fc..22e9337c4 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.h index 20a1a8056..b3812af17 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> |