From 66cca9be579c67a4d1d42a755716330e0befd8d3 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 14 Jul 2021 01:25:39 +0400 Subject: [PATCH] Add SYSTEM flag to target_include_directories where appropriate --- external/angle/CMakeLists.txt | 2 +- external/auto_updates/xz/CMakeLists.txt | 4 ++-- external/fcitx5_qt5/CMakeLists.txt | 2 +- external/ffmpeg/CMakeLists.txt | 2 +- external/glib/CMakeLists.txt | 2 +- external/glibmm/CMakeLists.txt | 2 +- external/hime_qt/hime_im_client/CMakeLists.txt | 2 +- external/jemalloc/CMakeLists.txt | 2 +- external/jpeg/CMakeLists.txt | 2 +- external/kwayland/CMakeLists.txt | 2 +- external/openal/CMakeLists.txt | 2 +- external/opus/CMakeLists.txt | 8 ++++---- external/qr_code_generator/CMakeLists.txt | 2 +- external/qt/CMakeLists.txt | 6 +++--- external/rnnoise/CMakeLists.txt | 6 +++--- external/ton/CMakeLists.txt | 2 +- external/webrtc/CMakeLists.txt | 4 ++-- external/xxhash/CMakeLists.txt | 2 +- external/zlib/CMakeLists.txt | 2 +- linux_gtk_helper/CMakeLists.txt | 2 +- options_mac.cmake | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/external/angle/CMakeLists.txt b/external/angle/CMakeLists.txt index a646db2..60664fb 100644 --- a/external/angle/CMakeLists.txt +++ b/external/angle/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(external_angle INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_angle ALIAS external_angle) if (WIN32) - target_include_directories(external_angle + target_include_directories(external_angle SYSTEM INTERFACE ${libs_loc}/tg_angle/include ) diff --git a/external/auto_updates/xz/CMakeLists.txt b/external/auto_updates/xz/CMakeLists.txt index 6f65c7a..ca9bdad 100644 --- a/external/auto_updates/xz/CMakeLists.txt +++ b/external/auto_updates/xz/CMakeLists.txt @@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED) find_package(LibLZMA REQUIRED) target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA) elseif (APPLE AND NOT build_osx) - target_include_directories(external_xz + target_include_directories(external_xz SYSTEM INTERFACE /usr/local/macos/include ) @@ -20,7 +20,7 @@ elseif (APPLE AND NOT build_osx) /usr/local/macos/lib/liblzma.a ) elseif (APPLE) - target_include_directories(external_xz + target_include_directories(external_xz SYSTEM INTERFACE /usr/local/include ) diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt5/CMakeLists.txt index e2e9517..2d57f29 100644 --- a/external/fcitx5_qt5/CMakeLists.txt +++ b/external/fcitx5_qt5/CMakeLists.txt @@ -67,7 +67,7 @@ else() find_package(PkgConfig REQUIRED) pkg_check_modules(XKBCOMMON REQUIRED xkbcommon) - target_include_directories(external_fcitx5_qt5 + target_include_directories(external_fcitx5_qt5 SYSTEM PUBLIC ${XKBCOMMON_INCLUDE_DIRS} ) diff --git a/external/ffmpeg/CMakeLists.txt b/external/ffmpeg/CMakeLists.txt index ef900e5..4479736 100644 --- a/external/ffmpeg/CMakeLists.txt +++ b/external/ffmpeg/CMakeLists.txt @@ -17,7 +17,7 @@ if (DESKTOP_APP_USE_PACKAGED) pkg_check_modules(SWRESAMPLE REQUIRED IMPORTED_TARGET libswresample) if (DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC) - target_include_directories(external_ffmpeg + target_include_directories(external_ffmpeg SYSTEM INTERFACE ${AVCODEC_STATIC_INCLUDE_DIRS} ${AVFORMAT_STATIC_INCLUDE_DIRS} diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt index 05b51eb..def4376 100644 --- a/external/glib/CMakeLists.txt +++ b/external/glib/CMakeLists.txt @@ -22,7 +22,7 @@ if (DESKTOP_APP_USE_PACKAGED) PkgConfig::GLIB2 ) else() - target_include_directories(external_glib + target_include_directories(external_glib SYSTEM INTERFACE ${GIO_UNIX_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} diff --git a/external/glibmm/CMakeLists.txt b/external/glibmm/CMakeLists.txt index 8c53c5e..d9d2ce7 100644 --- a/external/glibmm/CMakeLists.txt +++ b/external/glibmm/CMakeLists.txt @@ -18,7 +18,7 @@ if (DESKTOP_APP_USE_PACKAGED) PkgConfig::GLIBMM ) else() - target_include_directories(external_glibmm + target_include_directories(external_glibmm SYSTEM INTERFACE ${GIOMM_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt index 9e70b1d..3fd077f 100644 --- a/external/hime_qt/hime_im_client/CMakeLists.txt +++ b/external/hime_qt/hime_im_client/CMakeLists.txt @@ -84,7 +84,7 @@ else() else() pkg_check_modules(X11 REQUIRED x11) - target_include_directories(external_hime_im_client + target_include_directories(external_hime_im_client SYSTEM PRIVATE ${X11_INCLUDE_DIRS} ) diff --git a/external/jemalloc/CMakeLists.txt b/external/jemalloc/CMakeLists.txt index 9d7ce2f..6e85696 100644 --- a/external/jemalloc/CMakeLists.txt +++ b/external/jemalloc/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT JEMALLOC_FOUND) IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc.a" ) - target_include_directories(external_jemalloc_bundled + target_include_directories(external_jemalloc_bundled SYSTEM INTERFACE ${SOURCE_DIR}/include ) diff --git a/external/jpeg/CMakeLists.txt b/external/jpeg/CMakeLists.txt index f35a126..7cb228b 100644 --- a/external/jpeg/CMakeLists.txt +++ b/external/jpeg/CMakeLists.txt @@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED) find_package(JPEG) target_link_libraries(external_jpeg INTERFACE JPEG::JPEG) elseif (WIN32) - target_include_directories(external_jpeg INTERFACE ${libs_loc}/mozjpeg) + target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg) target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$,Debug,Release>/jpeg-static.lib) elseif (APPLE AND NOT build_osx) target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a) diff --git a/external/kwayland/CMakeLists.txt b/external/kwayland/CMakeLists.txt index 60988aa..2e908be 100644 --- a/external/kwayland/CMakeLists.txt +++ b/external/kwayland/CMakeLists.txt @@ -19,7 +19,7 @@ else() IMPORTED_LOCATION "${KWAYLAND_LIBRARY}" ) - target_include_directories(external_kwayland + target_include_directories(external_kwayland SYSTEM INTERFACE /usr/local/include/KF5 /usr/local/include/KF5/KWayland/Client diff --git a/external/openal/CMakeLists.txt b/external/openal/CMakeLists.txt index 2b3a2d1..f9a4055 100644 --- a/external/openal/CMakeLists.txt +++ b/external/openal/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(desktop-app::external_openal ALIAS external_openal) if (DESKTOP_APP_USE_PACKAGED) find_package(OpenAL) if (OPENAL_FOUND) - target_include_directories(external_openal INTERFACE ${OPENAL_INCLUDE_DIR}) + target_include_directories(external_openal SYSTEM INTERFACE ${OPENAL_INCLUDE_DIR}) target_link_libraries(external_openal INTERFACE ${OPENAL_LIBRARY}) else() find_package(PkgConfig REQUIRED) diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt index 71bfd65..83f7c06 100644 --- a/external/opus/CMakeLists.txt +++ b/external/opus/CMakeLists.txt @@ -17,7 +17,7 @@ else() add_library(desktop-app::external_opus ALIAS external_opus) if (WIN32) - target_include_directories(external_opus + target_include_directories(external_opus SYSTEM INTERFACE ${libs_loc}/opus/include ) @@ -32,7 +32,7 @@ else() IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib" ) elseif (APPLE AND NOT build_osx) - target_include_directories(external_opus + target_include_directories(external_opus SYSTEM INTERFACE /usr/local/macos/include/opus ) @@ -40,7 +40,7 @@ else() IMPORTED_LOCATION /usr/local/macos/lib/libopus.a ) elseif (APPLE) - target_include_directories(external_opus + target_include_directories(external_opus SYSTEM INTERFACE /usr/local/include/opus ) @@ -48,7 +48,7 @@ else() IMPORTED_LOCATION /usr/local/lib/libopus.a ) else() - target_include_directories(external_opus + target_include_directories(external_opus SYSTEM INTERFACE /usr/local/include/opus ) diff --git a/external/qr_code_generator/CMakeLists.txt b/external/qr_code_generator/CMakeLists.txt index 241cbf2..07905a6 100644 --- a/external/qr_code_generator/CMakeLists.txt +++ b/external/qr_code_generator/CMakeLists.txt @@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED) find_path(QRCODE_INCLUDE_DIRS QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen) if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS) - target_include_directories(external_qr_code_generator INTERFACE ${QRCODE_INCLUDE_DIRS}) + target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${QRCODE_INCLUDE_DIRS}) target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES}) endif() endif() diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index e7c78a8..c877682 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -18,7 +18,7 @@ if (DESKTOP_APP_USE_PACKAGED) Qt5::Network ) - target_include_directories(external_qt + target_include_directories(external_qt SYSTEM INTERFACE ${Qt5Core_PRIVATE_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} @@ -31,7 +31,7 @@ if (DESKTOP_APP_USE_PACKAGED) if (Qt5XkbCommonSupport_FOUND) target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport) - target_include_directories(external_qt + target_include_directories(external_qt SYSTEM INTERFACE ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS} ) @@ -40,7 +40,7 @@ if (DESKTOP_APP_USE_PACKAGED) if (Qt5WaylandClient_FOUND) target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) - target_include_directories(external_qt + target_include_directories(external_qt SYSTEM INTERFACE ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} ) diff --git a/external/rnnoise/CMakeLists.txt b/external/rnnoise/CMakeLists.txt index 3bba816..cef9444 100644 --- a/external/rnnoise/CMakeLists.txt +++ b/external/rnnoise/CMakeLists.txt @@ -18,7 +18,7 @@ else() set(rnnoise_lib_loc ${libs_loc}/rnnoise/out) if (WIN32) - target_include_directories(external_rnnoise + target_include_directories(external_rnnoise SYSTEM INTERFACE ${libs_loc}/rnnoise/include ) @@ -27,7 +27,7 @@ else() IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/rnnoise.lib" ) elseif (APPLE) - target_include_directories(external_rnnoise + target_include_directories(external_rnnoise SYSTEM INTERFACE ${libs_loc}/rnnoise/include ) @@ -36,7 +36,7 @@ else() IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/librnnoise.a" ) else() - target_include_directories(external_rnnoise + target_include_directories(external_rnnoise SYSTEM INTERFACE /usr/local/include ) diff --git a/external/ton/CMakeLists.txt b/external/ton/CMakeLists.txt index 4f5f0f9..9223913 100644 --- a/external/ton/CMakeLists.txt +++ b/external/ton/CMakeLists.txt @@ -17,7 +17,7 @@ else() set(ton_lib_suffix .a) endif() -target_include_directories(external_ton +target_include_directories(external_ton SYSTEM INTERFACE ${ton_loc} ${ton_loc}/crypto diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt index 675e4e5..464b7f6 100644 --- a/external/webrtc/CMakeLists.txt +++ b/external/webrtc/CMakeLists.txt @@ -59,7 +59,7 @@ else() ) endif() - target_include_directories(external_webrtc + target_include_directories(external_webrtc SYSTEM INTERFACE ${webrtc_loc} ${webrtc_loc}/third_party/abseil-cpp @@ -70,7 +70,7 @@ else() ${webrtc_lib_prefix}tg_owt ) if (APPLE) - target_include_directories(external_webrtc + target_include_directories(external_webrtc SYSTEM INTERFACE ${webrtc_loc}/sdk/objc ${webrtc_loc}/sdk/objc/base diff --git a/external/xxhash/CMakeLists.txt b/external/xxhash/CMakeLists.txt index 77be808..b3a721b 100644 --- a/external/xxhash/CMakeLists.txt +++ b/external/xxhash/CMakeLists.txt @@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED) find_path(XXHASH_INCLUDE_DIRS xxhash.h) if (XXHASH_LIBRARY AND XXHASH_INCLUDE_DIRS) - target_include_directories(external_xxhash INTERFACE ${XXHASH_INCLUDE_DIRS}) + target_include_directories(external_xxhash SYSTEM INTERFACE ${XXHASH_INCLUDE_DIRS}) target_link_libraries(external_xxhash INTERFACE ${XXHASH_LIBRARY}) endif() endif() diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index f3be3d5..2132ade 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED) target_link_libraries(external_zlib INTERFACE ZLIB::ZLIB) elseif (WIN32) target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI) - target_include_directories(external_zlib INTERFACE ${libs_loc}/zlib) + target_include_directories(external_zlib SYSTEM INTERFACE ${libs_loc}/zlib) if (build_win64) set(zlib_config_folder x64) else() diff --git a/linux_gtk_helper/CMakeLists.txt b/linux_gtk_helper/CMakeLists.txt index 32ec4aa..69973e8 100644 --- a/linux_gtk_helper/CMakeLists.txt +++ b/linux_gtk_helper/CMakeLists.txt @@ -21,4 +21,4 @@ PUBLIC find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED gtk+-3.0) -target_include_directories(linux_gtk_helper PRIVATE ${GTK_INCLUDE_DIRS}) +target_include_directories(linux_gtk_helper SYSTEM PRIVATE ${GTK_INCLUDE_DIRS}) diff --git a/options_mac.cmake b/options_mac.cmake index f59c0c0..a0fc1c0 100644 --- a/options_mac.cmake +++ b/options_mac.cmake @@ -15,7 +15,7 @@ else() ) endif() if (NOT DESKTOP_APP_USE_PACKAGED) - target_include_directories(common_options + target_include_directories(common_options SYSTEM INTERFACE /usr/local/macos/include )