diff options
| author | 2023-10-12 16:36:26 +0200 | |
|---|---|---|
| committer | 2023-10-25 21:47:32 +0200 | |
| commit | 79ba5d9c260ca4e2890b8e9c9efd79e3df5fe763 (patch) | |
| tree | 31f33d5ccac863e5584b3be53cd2e07a314c9b8e /src/common/CMakeLists.txt | |
| parent | Merge pull request #11812 from german77/save_capture (diff) | |
| download | yuzu-79ba5d9c260ca4e2890b8e9c9efd79e3df5fe763.tar.gz yuzu-79ba5d9c260ca4e2890b8e9c9efd79e3df5fe763.tar.xz yuzu-79ba5d9c260ca4e2890b8e9c9efd79e3df5fe763.zip | |
cmake: prefer system stb headers
Diffstat (limited to 'src/common/CMakeLists.txt')
| -rw-r--r-- | src/common/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 8a1861051..e216eb3de 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -120,6 +120,8 @@ add_library(common STATIC | |||
| 120 | socket_types.h | 120 | socket_types.h |
| 121 | spin_lock.cpp | 121 | spin_lock.cpp |
| 122 | spin_lock.h | 122 | spin_lock.h |
| 123 | stb.cpp | ||
| 124 | stb.h | ||
| 123 | steady_clock.cpp | 125 | steady_clock.cpp |
| 124 | steady_clock.h | 126 | steady_clock.h |
| 125 | stream.cpp | 127 | stream.cpp |
| @@ -208,6 +210,8 @@ if (MSVC) | |||
| 208 | /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data | 210 | /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data |
| 209 | /we4800 # Implicit conversion from 'type' to bool. Possible information loss | 211 | /we4800 # Implicit conversion from 'type' to bool. Possible information loss |
| 210 | ) | 212 | ) |
| 213 | else() | ||
| 214 | set_source_files_properties(stb.cpp PROPERTIES COMPILE_OPTIONS "-Wno-implicit-fallthrough;-Wno-missing-declarations;-Wno-missing-field-initializers") | ||
| 211 | endif() | 215 | endif() |
| 212 | 216 | ||
| 213 | if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | 217 | if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |
| @@ -223,7 +227,7 @@ endif() | |||
| 223 | 227 | ||
| 224 | create_target_directory_groups(common) | 228 | create_target_directory_groups(common) |
| 225 | 229 | ||
| 226 | target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile Threads::Threads) | 230 | target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile stb::headers Threads::Threads) |
| 227 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) | 231 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) |
| 228 | 232 | ||
| 229 | if (ANDROID) | 233 | if (ANDROID) |