From 56d660f25839616e6716b94323241d8e2c3c80d7 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 26 Aug 2024 11:01:54 +0200 Subject: [PATCH] [cmake] mark dependency includes SYSTEM Mark all dependency include paths SYSTEM so warnings from system headers are excluded from ci warning statistics --- CMakeLists.txt | 10 +++++----- channels/audin/client/alsa/CMakeLists.txt | 2 +- channels/audin/client/ios/CMakeLists.txt | 2 +- channels/audin/client/mac/CMakeLists.txt | 2 +- channels/audin/client/opensles/CMakeLists.txt | 2 +- channels/audin/client/oss/CMakeLists.txt | 2 +- channels/audin/client/pulse/CMakeLists.txt | 2 +- channels/audin/client/sndio/CMakeLists.txt | 2 +- channels/printer/client/cups/CMakeLists.txt | 2 +- channels/rdpecam/client/CMakeLists.txt | 2 +- channels/rdpsnd/client/alsa/CMakeLists.txt | 2 +- channels/rdpsnd/client/mac/CMakeLists.txt | 2 +- .../rdpsnd/client/opensles/CMakeLists.txt | 2 +- channels/rdpsnd/client/oss/CMakeLists.txt | 2 +- channels/rdpsnd/client/pulse/CMakeLists.txt | 2 +- channels/rdpsnd/client/sndio/CMakeLists.txt | 2 +- channels/tsmf/client/alsa/CMakeLists.txt | 2 +- channels/tsmf/client/ffmpeg/CMakeLists.txt | 2 +- channels/tsmf/client/gstreamer/CMakeLists.txt | 2 +- channels/tsmf/client/oss/CMakeLists.txt | 2 +- channels/tsmf/client/pulse/CMakeLists.txt | 2 +- channels/urbdrc/CMakeLists.txt | 2 +- client/SDL/SDL2/CMakeLists.txt | 4 ++-- client/SDL/SDL2/dialogs/CMakeLists.txt | 4 ++-- client/SDL/common/aad/CMakeLists.txt | 2 +- client/Wayland/CMakeLists.txt | 4 ++-- client/X11/CMakeLists.txt | 20 +++++++++---------- client/common/CMakeLists.txt | 4 ++-- client/iOS/CMakeLists.txt | 16 +++++++-------- cmake/ConfigureFreeRDP.cmake | 6 +++--- cmake/PlatformDefaults.cmake | 4 ++-- libfreerdp/CMakeLists.txt | 8 ++++---- libfreerdp/codec/CMakeLists.txt | 16 +++++++-------- libfreerdp/crypto/test/CMakeLists.txt | 2 +- rdtk/sample/CMakeLists.txt | 2 +- server/shadow/CMakeLists.txt | 2 +- server/shadow/Mac/CMakeLists.txt | 2 +- server/shadow/X11/CMakeLists.txt | 18 ++++++++--------- uwac/CMakeLists.txt | 6 +++--- uwac/libuwac/CMakeLists.txt | 6 +++--- winpr/libwinpr/sspi/test/CMakeLists.txt | 2 +- winpr/libwinpr/synch/test/CMakeLists.txt | 2 +- 42 files changed, 91 insertions(+), 91 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 310b7f008..b9711b90c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -547,7 +547,7 @@ find_feature(Wayland ${WAYLAND_FEATURE_TYPE} ${WAYLAND_FEATURE_PURPOSE} ${WAYLAN option(WITH_LIBRESSL "build with LibreSSL" OFF) if (WITH_LIBRESSL) find_package(LibreSSL REQUIRED) - include_directories(${LibreSSL_INCLUDE_DIRS}) + include_directories(SYSTEM ${LibreSSL_INCLUDE_DIRS}) set(OPENSSL_INCLUDE_DIR ${LIBRESSL_INCLUDE_DIR}) set(OPENSSL_LIBRARIES ${LIBRESSL_LIBRARIES}) set(OPENSSL_CRYPTO_LIBRARIES ${LIBRESSL_LIBRARIES}) @@ -620,7 +620,7 @@ set(WITH_OPENH264 ${OPENH264_FOUND}) if(OPENSSL_FOUND) add_definitions("-DWITH_OPENSSL") message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}") - include_directories(${OPENSSL_INCLUDE_DIR}) + include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) endif() if(MBEDTLS_FOUND) @@ -682,7 +682,7 @@ if(ANDROID) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") set(PROFILER_LIBRARIES "${FREERDP_EXTERNAL_PROFILER_PATH}/obj/local/${ANDROID_ABI}/libandroid-ndk-profiler.a") - include_directories("${FREERDP_EXTERNAL_PROFILER_PATH}") + include_directories(SYSTEM "${FREERDP_EXTERNAL_PROFILER_PATH}") endif() endif() @@ -725,7 +725,7 @@ if (FREERDP_UNIFIED_BUILD) include_directories(${PROJECT_BINARY_DIR}/winpr/include) else() find_package(WinPR 3 REQUIRED) - include_directories(${WinPR_INCLUDE_DIR}) + include_directories(SYSTEM ${WinPR_INCLUDE_DIR}) endif() option(WITH_AAD "Compile with support for Azure AD authentication" ${WITH_WINPR_JSON}) @@ -740,7 +740,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) if(WITH_THIRD_PARTY) add_subdirectory(third-party) if (NOT "${THIRD_PARTY_INCLUDES}" STREQUAL "") - include_directories(${THIRD_PARTY_INCLUDES}) + include_directories(SYSTEM ${THIRD_PARTY_INCLUDES}) endif() endif() diff --git a/channels/audin/client/alsa/CMakeLists.txt b/channels/audin/client/alsa/CMakeLists.txt index 1213f7474..2858fe3f1 100644 --- a/channels/audin/client/alsa/CMakeLists.txt +++ b/channels/audin/client/alsa/CMakeLists.txt @@ -30,6 +30,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${ALSA_INCLUDE_DIRS}) +include_directories(SYSTEM ${ALSA_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/audin/client/ios/CMakeLists.txt b/channels/audin/client/ios/CMakeLists.txt index e6ec3ad4e..72d42da61 100644 --- a/channels/audin/client/ios/CMakeLists.txt +++ b/channels/audin/client/ios/CMakeLists.txt @@ -34,6 +34,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${MAC_INCLUDE_DIRS}) +include_directories(SYSTEM ${MAC_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/audin/client/mac/CMakeLists.txt b/channels/audin/client/mac/CMakeLists.txt index 6b3e7922d..f57d11e07 100644 --- a/channels/audin/client/mac/CMakeLists.txt +++ b/channels/audin/client/mac/CMakeLists.txt @@ -36,6 +36,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${MAC_INCLUDE_DIRS}) +include_directories(SYSTEM ${MAC_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/audin/client/opensles/CMakeLists.txt b/channels/audin/client/opensles/CMakeLists.txt index 9b2a28713..7a27fb725 100644 --- a/channels/audin/client/opensles/CMakeLists.txt +++ b/channels/audin/client/opensles/CMakeLists.txt @@ -31,6 +31,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${OpenSLES_INCLUDE_DIRS}) +include_directories(SYSTEM ${OpenSLES_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/audin/client/oss/CMakeLists.txt b/channels/audin/client/oss/CMakeLists.txt index 5b4dac919..9cc894ce3 100644 --- a/channels/audin/client/oss/CMakeLists.txt +++ b/channels/audin/client/oss/CMakeLists.txt @@ -31,7 +31,7 @@ set(${MODULE_PREFIX}_LIBS include_directories(..) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${OSS_INCLUDE_DIRS}) +include_directories(SYSTEM ${OSS_INCLUDE_DIRS}) configure_file( ${CMAKE_SOURCE_DIR}/cmake/oss-includes.h.in ${CMAKE_CURRENT_BINARY_DIR}/oss-includes.h diff --git a/channels/audin/client/pulse/CMakeLists.txt b/channels/audin/client/pulse/CMakeLists.txt index 5bf0fcd15..af7744d28 100644 --- a/channels/audin/client/pulse/CMakeLists.txt +++ b/channels/audin/client/pulse/CMakeLists.txt @@ -30,6 +30,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${PULSEAUDIO_INCLUDE_DIR}) +include_directories(SYSTEM ${PULSEAUDIO_INCLUDE_DIR}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/audin/client/sndio/CMakeLists.txt b/channels/audin/client/sndio/CMakeLists.txt index ef6822817..1ec1bea35 100644 --- a/channels/audin/client/sndio/CMakeLists.txt +++ b/channels/audin/client/sndio/CMakeLists.txt @@ -30,7 +30,7 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${SNDIO_INCLUDE_DIRS}) +include_directories(SYSTEM ${SNDIO_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/printer/client/cups/CMakeLists.txt b/channels/printer/client/cups/CMakeLists.txt index c6b6f0e92..9181b3003 100644 --- a/channels/printer/client/cups/CMakeLists.txt +++ b/channels/printer/client/cups/CMakeLists.txt @@ -28,6 +28,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${CUPS_INCLUDE_DIRS}) +include_directories(SYSTEM ${CUPS_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/rdpecam/client/CMakeLists.txt b/channels/rdpecam/client/CMakeLists.txt index 0968fa940..b083b6559 100644 --- a/channels/rdpecam/client/CMakeLists.txt +++ b/channels/rdpecam/client/CMakeLists.txt @@ -31,7 +31,7 @@ else() message(FATAL_ERROR "libv4l-dev required for CHANNEL_RDPECAM_CLIENT") endif() -include_directories(${SWScale_INCLUDE_DIR}) +include_directories(SYSTEM ${SWScale_INCLUDE_DIR}) set(${MODULE_PREFIX}_SRCS camera_device_enum_main.c diff --git a/channels/rdpsnd/client/alsa/CMakeLists.txt b/channels/rdpsnd/client/alsa/CMakeLists.txt index 3041b952e..59e39a508 100644 --- a/channels/rdpsnd/client/alsa/CMakeLists.txt +++ b/channels/rdpsnd/client/alsa/CMakeLists.txt @@ -29,6 +29,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${ALSA_INCLUDE_DIRS}) +include_directories(SYSTEM ${ALSA_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/rdpsnd/client/mac/CMakeLists.txt b/channels/rdpsnd/client/mac/CMakeLists.txt index 4bcf1bc50..0a0746f34 100644 --- a/channels/rdpsnd/client/mac/CMakeLists.txt +++ b/channels/rdpsnd/client/mac/CMakeLists.txt @@ -39,6 +39,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${MACAUDIO_INCLUDE_DIRS}) +include_directories(SYSTEM ${MACAUDIO_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/rdpsnd/client/opensles/CMakeLists.txt b/channels/rdpsnd/client/opensles/CMakeLists.txt index 1df65e92f..991fb5486 100644 --- a/channels/rdpsnd/client/opensles/CMakeLists.txt +++ b/channels/rdpsnd/client/opensles/CMakeLists.txt @@ -30,6 +30,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${OpenSLES_INCLUDE_DIRS}) +include_directories(SYSTEM ${OpenSLES_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/rdpsnd/client/oss/CMakeLists.txt b/channels/rdpsnd/client/oss/CMakeLists.txt index c4957526a..10b9f5a36 100644 --- a/channels/rdpsnd/client/oss/CMakeLists.txt +++ b/channels/rdpsnd/client/oss/CMakeLists.txt @@ -31,7 +31,7 @@ set(${MODULE_PREFIX}_LIBS include_directories(..) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${OSS_INCLUDE_DIRS}) +include_directories(SYSTEM ${OSS_INCLUDE_DIRS}) configure_file( ${CMAKE_SOURCE_DIR}/cmake/oss-includes.h.in ${CMAKE_CURRENT_BINARY_DIR}/oss-includes.h diff --git a/channels/rdpsnd/client/pulse/CMakeLists.txt b/channels/rdpsnd/client/pulse/CMakeLists.txt index d42576c84..a48baab25 100644 --- a/channels/rdpsnd/client/pulse/CMakeLists.txt +++ b/channels/rdpsnd/client/pulse/CMakeLists.txt @@ -31,6 +31,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${PULSEAUDIO_INCLUDE_DIR}) +include_directories(SYSTEM ${PULSEAUDIO_INCLUDE_DIR}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/rdpsnd/client/sndio/CMakeLists.txt b/channels/rdpsnd/client/sndio/CMakeLists.txt index 78b9c06b7..1bc6e7063 100644 --- a/channels/rdpsnd/client/sndio/CMakeLists.txt +++ b/channels/rdpsnd/client/sndio/CMakeLists.txt @@ -31,6 +31,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${SNDIO_INCLUDE_DIRS}) +include_directories(SYSTEM ${SNDIO_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/tsmf/client/alsa/CMakeLists.txt b/channels/tsmf/client/alsa/CMakeLists.txt index 991054253..8e46523c6 100644 --- a/channels/tsmf/client/alsa/CMakeLists.txt +++ b/channels/tsmf/client/alsa/CMakeLists.txt @@ -30,6 +30,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${ALSA_INCLUDE_DIRS}) +include_directories(SYSTEM ${ALSA_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/tsmf/client/ffmpeg/CMakeLists.txt b/channels/tsmf/client/ffmpeg/CMakeLists.txt index a50bed0c6..2fbedd2c1 100644 --- a/channels/tsmf/client/ffmpeg/CMakeLists.txt +++ b/channels/tsmf/client/ffmpeg/CMakeLists.txt @@ -35,7 +35,7 @@ if(APPLE) endif() include_directories(..) -include_directories(${FFMPEG_INCLUDE_DIRS}) +include_directories(SYSTEM ${FFMPEG_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/tsmf/client/gstreamer/CMakeLists.txt b/channels/tsmf/client/gstreamer/CMakeLists.txt index 9490cc033..c696edb6d 100644 --- a/channels/tsmf/client/gstreamer/CMakeLists.txt +++ b/channels/tsmf/client/gstreamer/CMakeLists.txt @@ -33,7 +33,7 @@ set(LIBS ${gstreamervideo_LIBRARIES} ${gstreamerapp_LIBRARIES} ) -include_directories( +include_directories(SYSTEM ${gstreamer_INCLUDE_DIRS} ${gstreamerbase_INCLUDE_DIRS} ${gstreamervideo_INCLUDE_DIRS} diff --git a/channels/tsmf/client/oss/CMakeLists.txt b/channels/tsmf/client/oss/CMakeLists.txt index 9ff9e81cf..c10647879 100644 --- a/channels/tsmf/client/oss/CMakeLists.txt +++ b/channels/tsmf/client/oss/CMakeLists.txt @@ -29,7 +29,7 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${OSS_INCLUDE_DIRS}) +include_directories(SYSTEM ${OSS_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/tsmf/client/pulse/CMakeLists.txt b/channels/tsmf/client/pulse/CMakeLists.txt index 1aa67f0ba..0d39d93ee 100644 --- a/channels/tsmf/client/pulse/CMakeLists.txt +++ b/channels/tsmf/client/pulse/CMakeLists.txt @@ -30,6 +30,6 @@ set(${MODULE_PREFIX}_LIBS ) include_directories(..) -include_directories(${PULSEAUDIO_INCLUDE_DIR}) +include_directories(SYSTEM ${PULSEAUDIO_INCLUDE_DIR}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") diff --git a/channels/urbdrc/CMakeLists.txt b/channels/urbdrc/CMakeLists.txt index 0030e277d..e60d45550 100644 --- a/channels/urbdrc/CMakeLists.txt +++ b/channels/urbdrc/CMakeLists.txt @@ -24,7 +24,7 @@ if(WITH_CLIENT_CHANNELS) option(WITH_DEBUG_URBDRC "Dump data send/received in URBDRC channel" ${DEFAULT_DEBUG_OPTION}) find_package(libusb-1.0 REQUIRED) - include_directories(${LIBUSB_1_INCLUDE_DIRS}) + include_directories(SYSTEM ${LIBUSB_1_INCLUDE_DIRS}) add_channel_client(${MODULE_PREFIX} ${CHANNEL_NAME}) endif() diff --git a/client/SDL/SDL2/CMakeLists.txt b/client/SDL/SDL2/CMakeLists.txt index 684d2eb2e..f4391032a 100644 --- a/client/SDL/SDL2/CMakeLists.txt +++ b/client/SDL/SDL2/CMakeLists.txt @@ -17,8 +17,8 @@ set(MODULE_NAME "sdl2-freerdp") find_package(SDL2 REQUIRED COMPONENTS) -include_directories(${SDL2_INCLUDE_DIR}) -include_directories(${SDL2_INCLUDE_DIRS}) +include_directories(SYSTEM ${SDL2_INCLUDE_DIR}) +include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) find_package(Threads REQUIRED) diff --git a/client/SDL/SDL2/dialogs/CMakeLists.txt b/client/SDL/SDL2/dialogs/CMakeLists.txt index da04f3472..8db167518 100644 --- a/client/SDL/SDL2/dialogs/CMakeLists.txt +++ b/client/SDL/SDL2/dialogs/CMakeLists.txt @@ -39,11 +39,11 @@ macro(find_sdl_component name) if (BUILD_SHARED_LIBS) list(APPEND LIBS ${${name}_LIBRARIES}) link_directories(${${name}_LIBRARY_DIRS}) - include_directories(${${name}_INCLUDE_DIRS}) + include_directories(SYSTEM ${${name}_INCLUDE_DIRS}) else() list(APPEND LIBS ${${name}_STATIC_LIBRARIES}) link_directories(${${name}_STATIC_LIBRARY_DIRS}) - include_directories(${${name}_STATIC_INCLUDE_DIRS}) + include_directories(SYSTEM ${${name}_STATIC_INCLUDE_DIRS}) endif() else() if (WITH_SDL_LINK_SHARED) diff --git a/client/SDL/common/aad/CMakeLists.txt b/client/SDL/common/aad/CMakeLists.txt index 4a72fba54..260bb9229 100644 --- a/client/SDL/common/aad/CMakeLists.txt +++ b/client/SDL/common/aad/CMakeLists.txt @@ -60,7 +60,7 @@ if (WITH_WEBVIEW) if (NOT WEBVIEW_GTK_FOUND) pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED) endif() - include_directories(${WEBVIEW_GTK_INCLUDE_DIRS}) + include_directories(SYSTEM ${WEBVIEW_GTK_INCLUDE_DIRS}) list(APPEND LIBS ${WEBVIEW_GTK_LIBRARIES} ) diff --git a/client/Wayland/CMakeLists.txt b/client/Wayland/CMakeLists.txt index 41226ba83..378882378 100644 --- a/client/Wayland/CMakeLists.txt +++ b/client/Wayland/CMakeLists.txt @@ -19,7 +19,7 @@ set(MODULE_NAME "wlfreerdp") set(MODULE_PREFIX "FREERDP_CLIENT_WAYLAND") -include_directories(${WAYLAND_INCLUDE_DIR}) +include_directories(SYSTEM ${WAYLAND_INCLUDE_DIR}) set(${MODULE_PREFIX}_SRCS wlfreerdp.c @@ -41,7 +41,7 @@ if (FREERDP_UNIFIED_BUILD) include_directories(${PROJECT_BINARY_DIR}/uwac/include) else() find_package(uwac 0 REQUIRED) - include_directories(${UWAC_INCLUDE_DIR}) + include_directories(SYSTEM ${UWAC_INCLUDE_DIR}) endif() list (APPEND ${MODULE_PREFIX}_LIBS freerdp-client freerdp uwac) diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index a64aa4d28..afcd02e2f 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -42,8 +42,8 @@ include(ConfigureFreeRDP) find_package(X11 REQUIRED) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../resources) -include_directories(${X11_INCLUDE_DIRS}) -include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(SYSTEM ${X11_INCLUDE_DIRS}) +include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) set(SRCS xf_utils.h @@ -100,7 +100,7 @@ set(PRIV_LIBS find_package(X11 REQUIRED) if(X11_XShm_FOUND) add_definitions(-DWITH_XSHM) - include_directories(${X11_XShm_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_XShm_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xext_LIB} ) @@ -112,7 +112,7 @@ if (WITH_XINERAMA) find_package(X11 REQUIRED) if(X11_Xinerama_FOUND) add_definitions(-DWITH_XINERAMA) - include_directories(${X11_Xinerama_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xinerama_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xinerama_LIB} ) @@ -135,7 +135,7 @@ if (WITH_XCURSOR) find_package(X11 REQUIRED) if(X11_Xcursor_FOUND) add_definitions(-DWITH_XCURSOR) - include_directories(${X11_Xcursor_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xcursor_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xcursor_LIB} ) @@ -147,7 +147,7 @@ if (WITH_XV) find_package(X11 REQUIRED) if(X11_Xv_FOUND) add_definitions(-DWITH_XV) - include_directories(${X11_Xv_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xv_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xv_LIB} ) @@ -159,7 +159,7 @@ if (WITH_XI) find_package(X11 REQUIRED) if(X11_Xi_FOUND) add_definitions(-DWITH_XI) - include_directories(${X11_Xi_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xi_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xi_LIB} ) @@ -171,7 +171,7 @@ if(WITH_XRENDER) find_package(X11 REQUIRED) if(X11_Xrender_FOUND) add_definitions(-DWITH_XRENDER) - include_directories(${X11_Xrender_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xrender_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xrender_LIB} ) @@ -183,7 +183,7 @@ if (WITH_XRANDR) find_package(X11 REQUIRED) if(X11_Xrandr_FOUND) add_definitions(-DWITH_XRANDR) - include_directories(${X11_Xrandr_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xrandr_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xrandr_LIB} ) @@ -195,7 +195,7 @@ if (WITH_XFIXES) find_package(X11 REQUIRED) if(X11_Xfixes_FOUND) add_definitions(-DWITH_XFIXES) - include_directories(${X11_Xfixes_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xfixes_INCLUDE_PATH}) list(APPEND PRIV_LIBS ${X11_Xfixes_LIB} ) diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt index 177353395..43517ac7d 100644 --- a/client/common/CMakeLists.txt +++ b/client/common/CMakeLists.txt @@ -51,14 +51,14 @@ if(WITH_FUSE) find_package(PkgConfig REQUIRED) pkg_check_modules(FUSE3 REQUIRED fuse3) - include_directories(${FUSE3_INCLUDE_DIRS}) + include_directories(SYSTEM ${FUSE3_INCLUDE_DIRS}) add_definitions(-DWITH_FUSE) list(APPEND LIBS ${FUSE3_LIBRARIES}) add_definitions(-D_FILE_OFFSET_BITS=64) endif() -include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) AddTargetWithResourceFile(${MODULE_NAME} FALSE "${FREERDP_VERSION}" SRCS) diff --git a/client/iOS/CMakeLists.txt b/client/iOS/CMakeLists.txt index f7388b5c4..162d62392 100644 --- a/client/iOS/CMakeLists.txt +++ b/client/iOS/CMakeLists.txt @@ -43,14 +43,14 @@ set(IOS_CLIENT_MODELS_DIR ${IOS_CLIENT_DIR}/Models) set(IOS_CLIENT_VIEWS_DIR ${IOS_CLIENT_DIR}/Views) set(IOS_CLIENT_RESOURCES_DIR ${IOS_CLIENT_DIR}/Resources) -include_directories(${IOS_CLIENT_DIR}) -include_directories(${IOS_CLIENT_ADDITIONS_DIR}) -include_directories(${IOS_CLIENT_CONTROLLERS_DIR}) -include_directories(${IOS_CLIENT_FREERDP_DIR}) -include_directories(${IOS_CLIENT_MISC_DIR}) -include_directories(${IOS_CLIENT_MODELS_DIR}) -include_directories(${IOS_CLIENT_VIEWS_DIR}) -include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_ADDITIONS_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_CONTROLLERS_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_FREERDP_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_MISC_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_MODELS_DIR}) +include_directories(SYSTEM ${IOS_CLIENT_VIEWS_DIR}) +include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) # Add sources set(${MODULE_PREFIX}_SRCS diff --git a/cmake/ConfigureFreeRDP.cmake b/cmake/ConfigureFreeRDP.cmake index 6fe1e54ff..419667e7c 100644 --- a/cmake/ConfigureFreeRDP.cmake +++ b/cmake/ConfigureFreeRDP.cmake @@ -1,10 +1,10 @@ if (NOT FREERDP_UNIFIED_BUILD) find_package(WinPR 3 REQUIRED) - include_directories(${WinPR_INCLUDE_DIR}) + include_directories(SYSTEM ${WinPR_INCLUDE_DIR}) find_package(FreeRDP 3 REQUIRED) - include_directories(${FreeRDP_INCLUDE_DIR}) + include_directories(SYSTEM ${FreeRDP_INCLUDE_DIR}) find_package(FreeRDP-Client 3 REQUIRED) - include_directories(${FreeRDP-Client_INCLUDE_DIR}) + include_directories(SYSTEM ${FreeRDP-Client_INCLUDE_DIR}) endif() diff --git a/cmake/PlatformDefaults.cmake b/cmake/PlatformDefaults.cmake index 0037ebe09..e632510e9 100644 --- a/cmake/PlatformDefaults.cmake +++ b/cmake/PlatformDefaults.cmake @@ -84,12 +84,12 @@ if (USE_PLATFORM_DEFAULT) if(BSD) if(IS_DIRECTORY /usr/local/include) - include_directories(/usr/local/include) + include_directories(SYSTEM /usr/local/include) link_directories(/usr/local/lib) endif() if(OPENBSD) if(IS_DIRECTORY /usr/X11R6/include) - include_directories(/usr/X11R6/include) + include_directories(SYSTEM /usr/X11R6/include) endif() endif() endif() diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index 653e2c6ae..161a2edc6 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -102,7 +102,7 @@ if (WITH_FDK_AAC) pkg_check_modules(FDK_AAC REQUIRED fdk-aac) add_definitions(-DWITH_FDK_AAC) - include_directories(${FDK_AAC_INCLUDE_DIRS}) + include_directories(SYSTEM ${FDK_AAC_INCLUDE_DIRS}) link_directories(${FDK_AAC_LIBRARY_DIRS}) freerdp_library_add(${FDK_AAC_LIBRARIES}) @@ -147,11 +147,11 @@ endif(WITH_CAIRO) # Prefer SWScale over Cairo, both at the same time are not possible. if (WITH_SWSCALE) - include_directories(${SWScale_INCLUDE_DIR}) + include_directories(SYSTEM ${SWScale_INCLUDE_DIR}) freerdp_library_add(${SWScale_LIBRARY}) endif() if (WITH_CAIRO) - include_directories(${CAIRO_INCLUDE_DIR}) + include_directories(SYSTEM ${CAIRO_INCLUDE_DIR}) freerdp_library_add(${CAIRO_LIBRARY}) endif() if (NOT WITH_SWSCALE AND NOT WITH_CAIRO) @@ -189,7 +189,7 @@ list(APPEND LIBFREERDP_PUB_LIBS winpr) list(REMOVE_DUPLICATES LIBFREERDP_DEFINITIONS) list(REMOVE_DUPLICATES LIBFREERDP_INCLUDES) -include_directories(${LIBFREERDP_INCLUDES}) +include_directories(SYSTEM ${LIBFREERDP_INCLUDES}) if (LIBFREERDP_OBJECT_LIBS) list(REMOVE_DUPLICATES LIBFREERDP_OBJECT_LIBS) diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt index 24fb1450e..da2123b89 100644 --- a/libfreerdp/codec/CMakeLists.txt +++ b/libfreerdp/codec/CMakeLists.txt @@ -92,23 +92,23 @@ if (WITH_DSP_FFMPEG) ${CODEC_SRCS} dsp_ffmpeg.c dsp_ffmpeg.h) - include_directories(${FFMPEG_INCLUDE_DIRS}) + include_directories(SYSTEM ${FFMPEG_INCLUDE_DIRS}) list(APPEND CODEC_LIBS ${FFMPEG_LIBRARIES}) endif (WITH_DSP_FFMPEG) if (WITH_SOXR) list(APPEND CODEC_LIBS ${SOXR_LIBRARIES}) - include_directories(${SOXR_INCLUDE_DIR}) + include_directories(SYSTEM ${SOXR_INCLUDE_DIR}) endif(WITH_SOXR) if(GSM_FOUND) list(APPEND CODEC_LIBS ${GSM_LIBRARIES}) - include_directories(${GSM_INCLUDE_DIRS}) + include_directories(SYSTEM ${GSM_INCLUDE_DIRS}) endif() if(LAME_FOUND) list(APPEND CODEC_LIBS ${LAME_LIBRARIES}) - include_directories(${LAME_INCLUDE_DIRS}) + include_directories(SYSTEM ${LAME_INCLUDE_DIRS}) endif() if (WITH_FDK_AAC) @@ -121,17 +121,17 @@ endif() if(FAAD2_FOUND) list(APPEND CODEC_LIBS ${FAAD2_LIBRARIES}) - include_directories(${FAAD2_INCLUDE_DIRS}) + include_directories(SYSTEM ${FAAD2_INCLUDE_DIRS}) endif() if(FAAC_FOUND) list(APPEND CODEC_LIBS ${FAAC_LIBRARIES}) - include_directories(${FAAC_INCLUDE_DIRS}) + include_directories(SYSTEM ${FAAC_INCLUDE_DIRS}) endif() if(WITH_OPENH264) set(CODEC_SRCS ${CODEC_SRCS} h264_openh264.c) - include_directories(${OPENH264_INCLUDE_DIR}) + include_directories(SYSTEM ${OPENH264_INCLUDE_DIR}) if (NOT WITH_OPENH264_LOADING) list(APPEND CODEC_LIBS ${OPENH264_LIBRARIES}) endif (NOT WITH_OPENH264_LOADING) @@ -139,7 +139,7 @@ endif() if(WITH_VIDEO_FFMPEG) set(CODEC_SRCS ${CODEC_SRCS} h264_ffmpeg.c) - include_directories(${FFMPEG_INCLUDE_DIRS}) + include_directories(SYSTEM ${FFMPEG_INCLUDE_DIRS}) list(APPEND CODEC_LIBS ${FFMPEG_LIBRARIES}) endif() diff --git a/libfreerdp/crypto/test/CMakeLists.txt b/libfreerdp/crypto/test/CMakeLists.txt index 994c43f7a..484dd00ce 100644 --- a/libfreerdp/crypto/test/CMakeLists.txt +++ b/libfreerdp/crypto/test/CMakeLists.txt @@ -13,7 +13,7 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_DRIVER} ${${MODULE_PREFIX}_TESTS}) -include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) diff --git a/rdtk/sample/CMakeLists.txt b/rdtk/sample/CMakeLists.txt index 05f44f8f1..acaaef728 100644 --- a/rdtk/sample/CMakeLists.txt +++ b/rdtk/sample/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE_PREFIX "RDTK_SAMPLE") find_package(X11 REQUIRED) -include_directories(${X11_INCLUDE_DIR}) +include_directories(SYSTEM ${X11_INCLUDE_DIR}) set(SRCS rdtk_x11.c) diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt index 159b6b6f4..c33094783 100644 --- a/server/shadow/CMakeLists.txt +++ b/server/shadow/CMakeLists.txt @@ -55,7 +55,7 @@ set(SRCS if (NOT FREERDP_UNIFIED_BUILD) find_package(rdtk 0 REQUIRED) - include_directories(${RDTK_INCLUDE_DIR}) + include_directories(SYSTEM ${RDTK_INCLUDE_DIR}) else() if (NOT WITH_RDTK) message(FATAL_ERROR "-DWITH_RDTK=ON is required for unified FreeRDP build with shadow server") diff --git a/server/shadow/Mac/CMakeLists.txt b/server/shadow/Mac/CMakeLists.txt index 20c9a7bc9..6d7519bf2 100644 --- a/server/shadow/Mac/CMakeLists.txt +++ b/server/shadow/Mac/CMakeLists.txt @@ -15,7 +15,7 @@ set(LIBS if(PAM_FOUND) add_definitions(-DWITH_PAM) - include_directories(${PAM_INCLUDE_DIR}) + include_directories(SYSTEM ${PAM_INCLUDE_DIR}) list(APPEND LIBS ${PAM_LIBRARY}) else() message("building without PAM authentication support") diff --git a/server/shadow/X11/CMakeLists.txt b/server/shadow/X11/CMakeLists.txt index 70c9c2021..72282c0eb 100644 --- a/server/shadow/X11/CMakeLists.txt +++ b/server/shadow/X11/CMakeLists.txt @@ -1,13 +1,13 @@ find_package(X11 REQUIRED) if(X11_FOUND) add_definitions(-DWITH_X11) - include_directories(${X11_INCLUDE_DIR}) + include_directories(SYSTEM ${X11_INCLUDE_DIR}) list(APPEND LIBS ${X11_LIBRARIES}) endif() if(X11_XShm_FOUND) add_definitions(-DWITH_XSHM) - include_directories(${X11_XShm_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_XShm_INCLUDE_PATH}) list(APPEND LIBS ${X11_XShm_LIB}) endif() @@ -18,45 +18,45 @@ endif() if(X11_Xinerama_FOUND) add_definitions(-DWITH_XINERAMA) - include_directories(${X11_Xinerama_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xinerama_INCLUDE_PATH}) list(APPEND LIBS ${X11_Xinerama_LIB}) endif() if(X11_Xdamage_FOUND) add_definitions(-DWITH_XDAMAGE) - include_directories(${X11_Xdamage_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xdamage_INCLUDE_PATH}) list(APPEND LIBS ${X11_Xdamage_LIB}) endif() if(X11_Xfixes_FOUND) add_definitions(-DWITH_XFIXES) - include_directories(${X11_Xfixes_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_Xfixes_INCLUDE_PATH}) list(APPEND LIBS ${X11_Xfixes_LIB}) endif() if(X11_XTest_FOUND) add_definitions(-DWITH_XTEST) - include_directories(${X11_XTest_INCLUDE_PATH}) + include_directories(SYSTEM ${X11_XTest_INCLUDE_PATH}) list(APPEND LIBS ${X11_XTest_LIB}) endif() # XCursor and XRandr are currently not used so don't link them #if(X11_Xcursor_FOUND) # add_definitions(-DWITH_XCURSOR) -# include_directories(${X11_Xcursor_INCLUDE_PATH}) +# include_directories(SYSTEM ${X11_Xcursor_INCLUDE_PATH}) # list(APPEND LIBS ${X11_Xcursor_LIB}) #endif() #if(X11_Xrandr_FOUND) # add_definitions(-DWITH_XRANDR) -# include_directories(${X11_Xrandr_INCLUDE_PATH}) +# include_directories(SYSTEM ${X11_Xrandr_INCLUDE_PATH}) # list(APPEND LIBS ${X11_Xrandr_LIB}) #endif() find_package(PAM) if(PAM_FOUND) add_definitions(-DWITH_PAM) - include_directories(${PAM_INCLUDE_DIR}) + include_directories(SYSTEM ${PAM_INCLUDE_DIR}) list(APPEND LIBS ${PAM_LIBRARY}) else() message("building without PAM authentication support") diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt index 6e66c8b1f..362e0490a 100644 --- a/uwac/CMakeLists.txt +++ b/uwac/CMakeLists.txt @@ -71,7 +71,7 @@ endif() if (UWAC_HAVE_PIXMAN_REGION) find_package(PkgConfig REQUIRED) pkg_check_modules(pixman REQUIRED pixman-1) - include_directories(${pixman_INCLUDE_DIRS}) + include_directories(SYSTEM ${pixman_INCLUDE_DIRS}) elseif (FREERDP_UNIFIED_BUILD) include_directories(${PROJECT_SOURCE_DIR}/winpr/include) include_directories(${PROJECT_BINARY_DIR}/winpr/include) @@ -80,8 +80,8 @@ elseif (FREERDP_UNIFIED_BUILD) else() find_package(WinPR 3 REQUIRED) find_package(FreeRDP 3 REQUIRED) - include_directories(${WinPR_INCLUDE_DIR}) - include_directories(${FreeRDP_INCLUDE_DIR}) + include_directories(SYSTEM ${WinPR_INCLUDE_DIR}) + include_directories(SYSTEM ${FreeRDP_INCLUDE_DIR}) endif() set(WAYLAND_FEATURE_PURPOSE "Wayland") diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt index 9d57ad87f..5985f45b8 100644 --- a/uwac/libuwac/CMakeLists.txt +++ b/uwac/libuwac/CMakeLists.txt @@ -46,10 +46,10 @@ generate_protocol_file(fullscreen-shell-unstable-v1) generate_protocol_file(keyboard-shortcuts-inhibit-unstable-v1) if(FREEBSD) - include_directories(${EPOLLSHIM_INCLUDE_DIR}) + include_directories(SYSTEM ${EPOLLSHIM_INCLUDE_DIR}) endif() -include_directories(${WAYLAND_INCLUDE_DIR}) -include_directories(${XKBCOMMON_INCLUDE_DIR}) +include_directories(SYSTEM ${WAYLAND_INCLUDE_DIR}) +include_directories(SYSTEM ${XKBCOMMON_INCLUDE_DIR}) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include") include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include") include_directories("${CMAKE_CURRENT_BINARY_DIR}/protocols") diff --git a/winpr/libwinpr/sspi/test/CMakeLists.txt b/winpr/libwinpr/sspi/test/CMakeLists.txt index 5e0f15d27..27bcc5a2c 100644 --- a/winpr/libwinpr/sspi/test/CMakeLists.txt +++ b/winpr/libwinpr/sspi/test/CMakeLists.txt @@ -17,7 +17,7 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_DRIVER} ${${MODULE_PREFIX}_TESTS}) -include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) diff --git a/winpr/libwinpr/synch/test/CMakeLists.txt b/winpr/libwinpr/synch/test/CMakeLists.txt index 66d15c6d2..a862b9e98 100644 --- a/winpr/libwinpr/synch/test/CMakeLists.txt +++ b/winpr/libwinpr/synch/test/CMakeLists.txt @@ -23,7 +23,7 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_TESTS}) if(FREEBSD) - include_directories(${EPOLLSHIM_INCLUDE_DIR}) + include_directories(SYSTEM ${EPOLLSHIM_INCLUDE_DIR}) endif() add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})