From 25833cfd62b62698977c16ad8037b1c8064942fa Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 19 Mar 2024 01:08:54 -0500 Subject: [PATCH] CMake: Hide warnings in Externals also for non-msvc. --- CMake/DolphinDisableWarningsMSVC.cmake | 26 +++++++++++++----------- Externals/Bochs_disasm/CMakeLists.txt | 2 +- Externals/FreeSurround/CMakeLists.txt | 2 +- Externals/LZO/CMakeLists.txt | 2 +- Externals/SDL/CMakeLists.txt | 4 ++-- Externals/SFML/CMakeLists.txt | 4 ++-- Externals/bzip2/CMakeLists.txt | 2 +- Externals/cpp-optparse/CMakeLists.txt | 2 +- Externals/cubeb/CMakeLists.txt | 4 ++-- Externals/curl/CMakeLists.txt | 2 +- Externals/discord-rpc/src/CMakeLists.txt | 2 +- Externals/ed25519/CMakeLists.txt | 2 +- Externals/enet/CMakeLists.txt | 2 +- Externals/fmt/CMakeLists.txt | 2 +- Externals/glslang/CMakeLists.txt | 2 +- Externals/hidapi/CMakeLists.txt | 2 +- Externals/imgui/CMakeLists.txt | 2 +- Externals/implot/CMakeLists.txt | 2 +- Externals/libiconv-1.14/CMakeLists.txt | 2 +- Externals/liblzma/CMakeLists.txt | 2 +- Externals/libspng/CMakeLists.txt | 2 +- Externals/libusb/CMakeLists.txt | 2 +- Externals/lz4/CMakeLists.txt | 2 +- Externals/mGBA/CMakeLists.txt | 2 +- Externals/mbedtls/library/CMakeLists.txt | 12 +++++------ Externals/miniupnpc/CMakeLists.txt | 2 +- Externals/minizip/CMakeLists.txt | 2 +- Externals/pugixml/CMakeLists.txt | 2 +- Externals/soundtouch/CMakeLists.txt | 2 +- Externals/spirv_cross/CMakeLists.txt | 2 +- Externals/tinygltf/CMakeLists.txt | 2 +- Externals/xxhash/CMakeLists.txt | 2 +- Externals/zlib-ng/CMakeLists.txt | 2 +- Externals/zstd/CMakeLists.txt | 2 +- 34 files changed, 55 insertions(+), 53 deletions(-) diff --git a/CMake/DolphinDisableWarningsMSVC.cmake b/CMake/DolphinDisableWarningsMSVC.cmake index 43823a0ea4..dbd3553762 100644 --- a/CMake/DolphinDisableWarningsMSVC.cmake +++ b/CMake/DolphinDisableWarningsMSVC.cmake @@ -1,18 +1,20 @@ include(RemoveCompileFlag) -macro(dolphin_disable_warnings_msvc _target) +macro(dolphin_disable_warnings _target) + get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS) + if (_target_cxx_flags) + set(new_flags "") + foreach(flag IN LISTS _target_cxx_flags) + # all warning flags start with "/W" or "/w" or "-W" or "-w" + if (NOT "${flag}" MATCHES "^[-/][Ww]") + list(APPEND new_flags "${flag}") + endif() + endforeach() + set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${new_flags}") + endif() if (MSVC) - get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS) - if (_target_cxx_flags) - set(new_flags "") - foreach(flag IN LISTS _target_cxx_flags) - # all warning flags start with "/W" or "/w" or "-W" or "-w" - if (NOT "${flag}" MATCHES "^[-/][Ww]") - list(APPEND new_flags "${flag}") - endif() - endforeach() - set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${new_flags}") - endif() target_compile_options(${_target} PRIVATE "/W0") + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") + target_compile_options(${_target} PRIVATE "-w") endif() endmacro() diff --git a/Externals/Bochs_disasm/CMakeLists.txt b/Externals/Bochs_disasm/CMakeLists.txt index 2a643113e3..cb78a826c7 100644 --- a/Externals/Bochs_disasm/CMakeLists.txt +++ b/Externals/Bochs_disasm/CMakeLists.txt @@ -4,7 +4,7 @@ add_library(bdisasm STATIC resolve.cc syntax.cc ) -dolphin_disable_warnings_msvc(bdisasm) +dolphin_disable_warnings(bdisasm) if (WIN32) target_sources(bdisasm diff --git a/Externals/FreeSurround/CMakeLists.txt b/Externals/FreeSurround/CMakeLists.txt index d7f8bc3ea2..448842da2f 100644 --- a/Externals/FreeSurround/CMakeLists.txt +++ b/Externals/FreeSurround/CMakeLists.txt @@ -12,6 +12,6 @@ set(SRCS ) add_library(FreeSurround STATIC ${SRCS}) -dolphin_disable_warnings_msvc(FreeSurround) +dolphin_disable_warnings(FreeSurround) target_include_directories(FreeSurround PUBLIC include) target_compile_options(FreeSurround PRIVATE -w) diff --git a/Externals/LZO/CMakeLists.txt b/Externals/LZO/CMakeLists.txt index 44b59bd496..9f6669344e 100644 --- a/Externals/LZO/CMakeLists.txt +++ b/Externals/LZO/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(lzo2 STATIC minilzo.c ) -dolphin_disable_warnings_msvc(lzo2) +dolphin_disable_warnings(lzo2) target_include_directories(lzo2 PUBLIC diff --git a/Externals/SDL/CMakeLists.txt b/Externals/SDL/CMakeLists.txt index 15d3ffe4ce..599caff4d4 100644 --- a/Externals/SDL/CMakeLists.txt +++ b/Externals/SDL/CMakeLists.txt @@ -10,8 +10,8 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF) set(OPT_DEF_LIBC ON) add_subdirectory(SDL) if (TARGET SDL2) - dolphin_disable_warnings_msvc(SDL2) + dolphin_disable_warnings(SDL2) endif() if (TARGET SDL2-static) - dolphin_disable_warnings_msvc(SDL2-static) + dolphin_disable_warnings(SDL2-static) endif() diff --git a/Externals/SFML/CMakeLists.txt b/Externals/SFML/CMakeLists.txt index 1b7060ef95..1a5a24eced 100644 --- a/Externals/SFML/CMakeLists.txt +++ b/Externals/SFML/CMakeLists.txt @@ -27,5 +27,5 @@ target_compile_definitions(sfml-system PUBLIC SFML_STATIC) target_include_directories(sfml-system PUBLIC include PRIVATE src) target_include_directories(sfml-network PUBLIC include PRIVATE src) target_link_libraries(sfml-network PUBLIC sfml-system) -dolphin_disable_warnings_msvc(sfml-network) -dolphin_disable_warnings_msvc(sfml-system) +dolphin_disable_warnings(sfml-network) +dolphin_disable_warnings(sfml-system) diff --git a/Externals/bzip2/CMakeLists.txt b/Externals/bzip2/CMakeLists.txt index f19d532e1b..5ab09692df 100644 --- a/Externals/bzip2/CMakeLists.txt +++ b/Externals/bzip2/CMakeLists.txt @@ -70,7 +70,7 @@ set(BZIP2_SRCS add_library(bzip2 STATIC ${BZIP2_SRCS} ${BZIP2_PUBLIC_HDRS} ${BZIP2_PRIVATE_HDRS}) add_library(BZip2::BZip2 ALIAS bzip2) -dolphin_disable_warnings_msvc(bzip2) +dolphin_disable_warnings(bzip2) target_include_directories(bzip2 PUBLIC diff --git a/Externals/cpp-optparse/CMakeLists.txt b/Externals/cpp-optparse/CMakeLists.txt index 0f92f22bfd..cfd5e44876 100644 --- a/Externals/cpp-optparse/CMakeLists.txt +++ b/Externals/cpp-optparse/CMakeLists.txt @@ -3,5 +3,5 @@ check_and_add_flag(CXX11 -std=c++11) set(SRCS OptionParser.cpp OptionParser.h) add_library(cpp-optparse STATIC ${SRCS}) -dolphin_disable_warnings_msvc(cpp-optparse) +dolphin_disable_warnings(cpp-optparse) target_include_directories(cpp-optparse PUBLIC .) diff --git a/Externals/cubeb/CMakeLists.txt b/Externals/cubeb/CMakeLists.txt index e428d88e01..1cce7d18ab 100644 --- a/Externals/cubeb/CMakeLists.txt +++ b/Externals/cubeb/CMakeLists.txt @@ -69,7 +69,7 @@ add_library(cubeb cubeb/src/cubeb_strings.c cubeb/src/cubeb_utils.cpp ) -dolphin_disable_warnings_msvc(cubeb) +dolphin_disable_warnings(cubeb) target_include_directories(cubeb PUBLIC $ $ ) @@ -127,7 +127,7 @@ endif() if(NOT TARGET speex) add_library(speex OBJECT cubeb/subprojects/speex/resample.c) - dolphin_disable_warnings_msvc(speex) + dolphin_disable_warnings(speex) set_target_properties(speex PROPERTIES POSITION_INDEPENDENT_CODE TRUE) target_include_directories(speex INTERFACE cubeb/subprojects) target_compile_definitions(speex PUBLIC diff --git a/Externals/curl/CMakeLists.txt b/Externals/curl/CMakeLists.txt index 1d01b5a872..2f152ceabf 100644 --- a/Externals/curl/CMakeLists.txt +++ b/Externals/curl/CMakeLists.txt @@ -45,7 +45,7 @@ if(NOT CURL_CA_PATH_SET) endif() endif() -dolphin_disable_warnings_msvc(curl) +dolphin_disable_warnings(curl) target_link_libraries(curl ${CURL_LIBS}) target_include_directories(curl PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/curl/include") target_compile_definitions(curl PRIVATE "BUILDING_LIBCURL=1") diff --git a/Externals/discord-rpc/src/CMakeLists.txt b/Externals/discord-rpc/src/CMakeLists.txt index e3296173e0..2e8b9f6c3d 100644 --- a/Externals/discord-rpc/src/CMakeLists.txt +++ b/Externals/discord-rpc/src/CMakeLists.txt @@ -31,7 +31,7 @@ if(WIN32) add_definitions(-DDISCORD_WINDOWS) set(BASE_RPC_SRC ${BASE_RPC_SRC} connection_win.cpp discord_register_win.cpp) add_library(discord-rpc ${BASE_RPC_SRC}) - dolphin_disable_warnings_msvc(discord-rpc) + dolphin_disable_warnings(discord-rpc) if (MSVC) if(USE_STATIC_CRT) foreach(CompilerFlag diff --git a/Externals/ed25519/CMakeLists.txt b/Externals/ed25519/CMakeLists.txt index 1e0080b12b..eeea8cca26 100644 --- a/Externals/ed25519/CMakeLists.txt +++ b/Externals/ed25519/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(ed25519 sc.c sha512.c verify.c) -dolphin_disable_warnings_msvc(ed25519) +dolphin_disable_warnings(ed25519) diff --git a/Externals/enet/CMakeLists.txt b/Externals/enet/CMakeLists.txt index c52052330b..5707a8c00c 100644 --- a/Externals/enet/CMakeLists.txt +++ b/Externals/enet/CMakeLists.txt @@ -92,7 +92,7 @@ add_library(enet STATIC ) target_include_directories(enet PUBLIC enet/include) -dolphin_disable_warnings_msvc(enet) +dolphin_disable_warnings(enet) add_library(enet::enet ALIAS enet) if (MINGW) diff --git a/Externals/fmt/CMakeLists.txt b/Externals/fmt/CMakeLists.txt index 2b4e30dc32..6c3ae26666 100755 --- a/Externals/fmt/CMakeLists.txt +++ b/Externals/fmt/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(fmt) -dolphin_disable_warnings_msvc(fmt) +dolphin_disable_warnings(fmt) diff --git a/Externals/glslang/CMakeLists.txt b/Externals/glslang/CMakeLists.txt index df5dfa0408..9b096d7bc0 100644 --- a/Externals/glslang/CMakeLists.txt +++ b/Externals/glslang/CMakeLists.txt @@ -73,7 +73,7 @@ endif() endif() add_library(glslang STATIC ${SRCS}) -dolphin_disable_warnings_msvc(glslang) +dolphin_disable_warnings(glslang) target_include_directories(glslang PRIVATE diff --git a/Externals/hidapi/CMakeLists.txt b/Externals/hidapi/CMakeLists.txt index 8c664d51d8..6ea9d24e4f 100644 --- a/Externals/hidapi/CMakeLists.txt +++ b/Externals/hidapi/CMakeLists.txt @@ -1,7 +1,7 @@ project(hidapi) add_library(hidapi STATIC hidapi-src/hidapi/hidapi.h) -dolphin_disable_warnings_msvc(hidapi) +dolphin_disable_warnings(hidapi) target_include_directories(hidapi PUBLIC hidapi-src/hidapi) if(APPLE) diff --git a/Externals/imgui/CMakeLists.txt b/Externals/imgui/CMakeLists.txt index 5a1a836563..43274cf88a 100644 --- a/Externals/imgui/CMakeLists.txt +++ b/Externals/imgui/CMakeLists.txt @@ -13,7 +13,7 @@ set(SRCS ) add_library(imgui STATIC ${SRCS}) -dolphin_disable_warnings_msvc(imgui) +dolphin_disable_warnings(imgui) target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_link_libraries(imgui diff --git a/Externals/implot/CMakeLists.txt b/Externals/implot/CMakeLists.txt index b25effa851..922ae4ff93 100644 --- a/Externals/implot/CMakeLists.txt +++ b/Externals/implot/CMakeLists.txt @@ -10,7 +10,7 @@ set(SRCS ) add_library(implot STATIC ${SRCS}) -dolphin_disable_warnings_msvc(implot) +dolphin_disable_warnings(implot) target_include_directories(implot PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/implot" PRIVATE imgui diff --git a/Externals/libiconv-1.14/CMakeLists.txt b/Externals/libiconv-1.14/CMakeLists.txt index 9f04f671ff..54c3ca6eec 100644 --- a/Externals/libiconv-1.14/CMakeLists.txt +++ b/Externals/libiconv-1.14/CMakeLists.txt @@ -9,5 +9,5 @@ target_include_directories(iconv PRIVATE libcharset/include ) -dolphin_disable_warnings_msvc(iconv) +dolphin_disable_warnings(iconv) add_library(Iconv::Iconv ALIAS iconv) diff --git a/Externals/liblzma/CMakeLists.txt b/Externals/liblzma/CMakeLists.txt index dd979c5b68..3c728a007e 100644 --- a/Externals/liblzma/CMakeLists.txt +++ b/Externals/liblzma/CMakeLists.txt @@ -207,7 +207,7 @@ set(LZMA_SRCS add_library(lzma STATIC ${LZMA_SRCS} ${LZMA_PUBLIC_HDRS}) add_library(LibLZMA::LibLZMA ALIAS lzma) -dolphin_disable_warnings_msvc(lzma) +dolphin_disable_warnings(lzma) target_compile_definitions(lzma PUBLIC LZMA_API_STATIC) diff --git a/Externals/libspng/CMakeLists.txt b/Externals/libspng/CMakeLists.txt index 315997a45a..8033110100 100644 --- a/Externals/libspng/CMakeLists.txt +++ b/Externals/libspng/CMakeLists.txt @@ -6,5 +6,5 @@ add_library(spng STATIC libspng/spng/spng.c) target_compile_definitions(spng PUBLIC SPNG_STATIC) target_link_libraries(spng PUBLIC ZLIB::ZLIB) target_include_directories(spng PUBLIC libspng/spng) -dolphin_disable_warnings_msvc(spng) +dolphin_disable_warnings(spng) add_library(spng::spng ALIAS spng) diff --git a/Externals/libusb/CMakeLists.txt b/Externals/libusb/CMakeLists.txt index 47ff1d8e0d..c91df85403 100644 --- a/Externals/libusb/CMakeLists.txt +++ b/Externals/libusb/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(usb STATIC EXCLUDE_FROM_ALL libusb/libusb/strerror.c libusb/libusb/sync.c ) -dolphin_disable_warnings_msvc(usb) +dolphin_disable_warnings(usb) set_target_properties(usb PROPERTIES VERSION 1.0.26) if(WIN32) diff --git a/Externals/lz4/CMakeLists.txt b/Externals/lz4/CMakeLists.txt index 7af19ebbe2..b1ee41c586 100644 --- a/Externals/lz4/CMakeLists.txt +++ b/Externals/lz4/CMakeLists.txt @@ -8,6 +8,6 @@ set(LZ4_BUNDLED_MODE ON) add_subdirectory(lz4/build/cmake) -dolphin_disable_warnings_msvc(lz4_static) +dolphin_disable_warnings(lz4_static) add_library(LZ4::LZ4 ALIAS lz4_static) target_compile_definitions(lz4_static PRIVATE XXH_NAMESPACE=LZ4_) diff --git a/Externals/mGBA/CMakeLists.txt b/Externals/mGBA/CMakeLists.txt index 87121b1fa2..f48231e352 100644 --- a/Externals/mGBA/CMakeLists.txt +++ b/Externals/mGBA/CMakeLists.txt @@ -1,7 +1,7 @@ set(LIBMGBA_ONLY ON) set(USE_LZMA ON) add_subdirectory(mgba EXCLUDE_FROM_ALL) -dolphin_disable_warnings_msvc(mgba) +dolphin_disable_warnings(mgba) target_compile_definitions(mgba PUBLIC HAVE_CRC32) target_link_libraries(mgba ZLIB::ZLIB) diff --git a/Externals/mbedtls/library/CMakeLists.txt b/Externals/mbedtls/library/CMakeLists.txt index 5aa233e080..8aa6efd47b 100644 --- a/Externals/mbedtls/library/CMakeLists.txt +++ b/Externals/mbedtls/library/CMakeLists.txt @@ -189,34 +189,34 @@ endif() if(USE_STATIC_MBEDTLS_LIBRARY) add_library(${mbedcrypto_static_target} STATIC ${src_crypto}) - dolphin_disable_warnings_msvc(${mbedcrypto_static_target}) + dolphin_disable_warnings(${mbedcrypto_static_target}) set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto) target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs}) add_library(${mbedx509_static_target} STATIC ${src_x509}) - dolphin_disable_warnings_msvc(${mbedx509_static_target}) + dolphin_disable_warnings(${mbedx509_static_target}) set_target_properties(${mbedx509_static_target} PROPERTIES OUTPUT_NAME mbedx509) target_link_libraries(${mbedx509_static_target} PUBLIC ${libs} ${mbedcrypto_static_target}) add_library(${mbedtls_static_target} STATIC ${src_tls}) - dolphin_disable_warnings_msvc(${mbedtls_static_target}) + dolphin_disable_warnings(${mbedtls_static_target}) set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls) target_link_libraries(${mbedtls_static_target} PUBLIC ${libs} ${mbedx509_static_target}) endif(USE_STATIC_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY) add_library(${mbedcrypto_target} SHARED ${src_crypto}) - dolphin_disable_warnings_msvc(${mbedcrypto_target}) + dolphin_disable_warnings(${mbedcrypto_target}) set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 2.28.0 SOVERSION 7) target_link_libraries(${mbedcrypto_target} PUBLIC ${libs}) add_library(${mbedx509_target} SHARED ${src_x509}) - dolphin_disable_warnings_msvc(${mbedx509_target}) + dolphin_disable_warnings(${mbedx509_target}) set_target_properties(${mbedx509_target} PROPERTIES VERSION 2.28.0 SOVERSION 1) target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target}) add_library(${mbedtls_target} SHARED ${src_tls}) - dolphin_disable_warnings_msvc(${mbedtls_target}) + dolphin_disable_warnings(${mbedtls_target}) set_target_properties(${mbedtls_target} PROPERTIES VERSION 2.28.0 SOVERSION 14) target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target}) endif(USE_SHARED_MBEDTLS_LIBRARY) diff --git a/Externals/miniupnpc/CMakeLists.txt b/Externals/miniupnpc/CMakeLists.txt index 602de41c55..9d441b269d 100644 --- a/Externals/miniupnpc/CMakeLists.txt +++ b/Externals/miniupnpc/CMakeLists.txt @@ -33,7 +33,7 @@ set(SRCS src/igd_desc_parse.c src/receivedata.c) add_library(miniupnpc STATIC ${SRCS}) -dolphin_disable_warnings_msvc(miniupnpc) +dolphin_disable_warnings(miniupnpc) target_include_directories(miniupnpc PUBLIC src) add_library(Miniupnpc::miniupnpc ALIAS miniupnpc) diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt index 09aba92e57..774cb0b6a7 100644 --- a/Externals/minizip/CMakeLists.txt +++ b/Externals/minizip/CMakeLists.txt @@ -26,7 +26,7 @@ add_library(minizip STATIC unzip.h zip.h ) -dolphin_disable_warnings_msvc(minizip) +dolphin_disable_warnings(minizip) if (UNIX) target_sources(minizip PRIVATE diff --git a/Externals/pugixml/CMakeLists.txt b/Externals/pugixml/CMakeLists.txt index 11c0990658..bc7e561fb4 100644 --- a/Externals/pugixml/CMakeLists.txt +++ b/Externals/pugixml/CMakeLists.txt @@ -35,7 +35,7 @@ if(BUILD_SHARED_LIBS) else() add_library(pugixml STATIC ${SOURCES}) endif() -dolphin_disable_warnings_msvc(pugixml) +dolphin_disable_warnings(pugixml) set_target_properties(pugixml PROPERTIES VERSION 1.8 SOVERSION 1) get_target_property(PUGIXML_VERSION_STRING pugixml VERSION) diff --git a/Externals/soundtouch/CMakeLists.txt b/Externals/soundtouch/CMakeLists.txt index 46b5a2a965..6372095ba8 100644 --- a/Externals/soundtouch/CMakeLists.txt +++ b/Externals/soundtouch/CMakeLists.txt @@ -19,4 +19,4 @@ set(SRCS ) add_library(SoundTouch STATIC ${SRCS}) -dolphin_disable_warnings_msvc(SoundTouch) +dolphin_disable_warnings(SoundTouch) diff --git a/Externals/spirv_cross/CMakeLists.txt b/Externals/spirv_cross/CMakeLists.txt index 1063ef65af..db55eec305 100644 --- a/Externals/spirv_cross/CMakeLists.txt +++ b/Externals/spirv_cross/CMakeLists.txt @@ -47,7 +47,7 @@ endif() endif() add_library(spirv_cross STATIC ${SRCS}) -dolphin_disable_warnings_msvc(spirv_cross) +dolphin_disable_warnings(spirv_cross) target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS) target_include_directories(spirv_cross PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Cross/include ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Cross) diff --git a/Externals/tinygltf/CMakeLists.txt b/Externals/tinygltf/CMakeLists.txt index a551d6def3..0d86268bbe 100644 --- a/Externals/tinygltf/CMakeLists.txt +++ b/Externals/tinygltf/CMakeLists.txt @@ -8,4 +8,4 @@ endif() target_sources(tinygltf PRIVATE tinygltf/tiny_gltf.cc) target_include_directories(tinygltf INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -dolphin_disable_warnings_msvc(tinygltf) +dolphin_disable_warnings(tinygltf) diff --git a/Externals/xxhash/CMakeLists.txt b/Externals/xxhash/CMakeLists.txt index 6d52f56478..c275795083 100644 --- a/Externals/xxhash/CMakeLists.txt +++ b/Externals/xxhash/CMakeLists.txt @@ -1,7 +1,7 @@ project(xxhash C) add_library(xxhash STATIC xxHash/xxhash.c) -dolphin_disable_warnings_msvc(xxhash) +dolphin_disable_warnings(xxhash) target_include_directories(xxhash PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xxHash diff --git a/Externals/zlib-ng/CMakeLists.txt b/Externals/zlib-ng/CMakeLists.txt index 39accc8b40..2b686c0b12 100644 --- a/Externals/zlib-ng/CMakeLists.txt +++ b/Externals/zlib-ng/CMakeLists.txt @@ -12,4 +12,4 @@ set(ZLIB_LIBRARY ZLIB::ZLIB CACHE STRING "Path to zlib library") # Setup zlib alias project so FindZLIB doesn't recreate it add_library(ZLIB::ZLIB ALIAS zlib) -dolphin_disable_warnings_msvc(zlib) +dolphin_disable_warnings(zlib) diff --git a/Externals/zstd/CMakeLists.txt b/Externals/zstd/CMakeLists.txt index 77932c74e7..fdcabb0956 100644 --- a/Externals/zstd/CMakeLists.txt +++ b/Externals/zstd/CMakeLists.txt @@ -115,7 +115,7 @@ set(ZSTD_SRCS ) add_library(zstd STATIC ${ZSTD_SRCS} ${ZSTD_PUBLIC_HDRS} ${ZSTD_PRIVATE_HDRS}) -dolphin_disable_warnings_msvc(zstd) +dolphin_disable_warnings(zstd) add_library(zstd::zstd ALIAS zstd) target_include_directories(zstd