diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 266331b0ac..f647204a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -417,12 +417,9 @@ AddJsonPackage(boost) set(BOOST_NO_HEADERS ${Boost_ADDED}) if (Boost_ADDED) - if (MSVC OR ANDROID) - add_compile_definitions(YUZU_BOOST_v1) - endif() - + add_compile_definitions(YUZU_BOOST_v1) if (NOT MSVC OR CXX_CLANG) - # boost sucks + # solaris sucks if (SOLARIS) add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-pthreads>) endif() @@ -431,8 +428,7 @@ if (Boost_ADDED) target_compile_options(boost_icl INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>) target_compile_options(boost_asio INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion> - $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough> - ) + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>) endif() endif() |