From ca0955c3fe71478bede0950bd7b22f31f7e1fb34 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 4 Jan 2023 19:16:13 +0100
Subject: [PATCH] Mark system include paths correctly

This makes sure the compiler doesn't complain about problems in those
files.
---
 common/rdr/CMakeLists.txt       |  6 +++---
 common/rfb/CMakeLists.txt       | 10 +++++-----
 tests/perf/CMakeLists.txt       |  4 ++--
 tests/unit/CMakeLists.txt       |  2 +-
 unix/tx/CMakeLists.txt          |  2 +-
 unix/vncconfig/CMakeLists.txt   |  2 +-
 unix/x0vncserver/CMakeLists.txt |  2 +-
 vncviewer/CMakeLists.txt        |  4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
index 7f642b48..429d0c72 100644
--- a/common/rdr/CMakeLists.txt
+++ b/common/rdr/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(${CMAKE_SOURCE_DIR}/common)
-include_directories(${ZLIB_INCLUDE_DIRS})
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
 
 add_library(rdr STATIC
   AESInStream.cxx
@@ -22,11 +22,11 @@ add_library(rdr STATIC
 target_link_libraries(rdr ${ZLIB_LIBRARIES} os)
 
 if(GNUTLS_FOUND)
-  include_directories(${GNUTLS_INCLUDE_DIR})
+  include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR})
   target_link_libraries(rdr ${GNUTLS_LIBRARIES})
 endif()
 if (NETTLE_FOUND)
-  include_directories(${NETTLE_INCLUDE_DIRS})
+  include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS})
   target_link_libraries(rdr ${NETTLE_LIBRARIES})
   target_link_directories(rdr PUBLIC ${NETTLE_LIBRARY_DIRS})
 endif()
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index b7ac1145..e18cff34 100644
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR}/common)
-include_directories(${JPEG_INCLUDE_DIR})
-include_directories(${PIXMAN_INCLUDE_DIRS})
+include_directories(SYSTEM ${JPEG_INCLUDE_DIR})
+include_directories(SYSTEM ${PIXMAN_INCLUDE_DIRS})
 
 add_library(rfb STATIC
   Blacklist.cxx
@@ -77,7 +77,7 @@ if(ENABLE_H264 AND NOT H264_LIBS STREQUAL "NONE")
   elseif(H264_LIBS STREQUAL "WIN")
     target_sources(rfb PRIVATE H264WinDecoderContext.cxx)
   endif()
-  include_directories(${H264_INCLUDE_DIRS})
+  include_directories(SYSTEM ${H264_INCLUDE_DIRS})
   target_link_libraries(rfb ${H264_LIBRARIES})
   target_link_directories(rfb PUBLIC ${H264_LIBRARY_DIRS})
 endif()
@@ -98,14 +98,14 @@ endif()
 
 if(GNUTLS_FOUND)
   target_sources(rfb PRIVATE CSecurityTLS.cxx SSecurityTLS.cxx)
-  include_directories(${GNUTLS_INCLUDE_DIR})
+  include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR})
   target_link_libraries(rfb ${GNUTLS_LIBRARIES})
 endif()
 
 if (NETTLE_FOUND)
   target_sources(rfb PRIVATE CSecurityDH.cxx CSecurityMSLogonII.cxx
                  CSecurityRSAAES.cxx SSecurityRSAAES.cxx)
-  include_directories(${NETTLE_INCLUDE_DIRS} ${GMP_INCLUDE_DIRS})
+  include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS} ${GMP_INCLUDE_DIRS})
   target_link_libraries(rfb ${HOGWEED_LIBRARIES}
                         ${NETTLE_LIBRARIES} ${GMP_LIBRARIES})
   target_link_directories(rfb PUBLIC ${HOGWEED_LIBRARY_DIRS}
diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
index 70ffe777..562adfc0 100644
--- a/tests/perf/CMakeLists.txt
+++ b/tests/perf/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(${CMAKE_SOURCE_DIR}/common)
-include_directories(${GETTEXT_INCLUDE_DIR})
+include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR})
 
 add_library(test_util STATIC util.cxx)
 
@@ -13,7 +13,7 @@ add_executable(encperf encperf.cxx)
 target_link_libraries(encperf test_util rfb)
 
 if (BUILD_VIEWER)
-  include_directories(${FLTK_INCLUDE_DIR})
+  include_directories(SYSTEM ${FLTK_INCLUDE_DIR})
   add_executable(fbperf
     fbperf.cxx
     ${CMAKE_SOURCE_DIR}/vncviewer/PlatformPixelBuffer.cxx
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 6daecba5..00f38b76 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR}/common)
 include_directories(${CMAKE_SOURCE_DIR}/vncviewer)
-include_directories(${GETTEXT_INCLUDE_DIR})
+include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR})
 
 add_executable(conv conv.cxx)
 target_link_libraries(conv rfb)
diff --git a/unix/tx/CMakeLists.txt b/unix/tx/CMakeLists.txt
index 67976150..e913de3c 100644
--- a/unix/tx/CMakeLists.txt
+++ b/unix/tx/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${X11_INCLUDE_DIR})
+include_directories(SYSTEM ${X11_INCLUDE_DIR})
 
 include_directories(${CMAKE_SOURCE_DIR}/common)
 include_directories(${CMAKE_SOURCE_DIR}/common/rfb)
diff --git a/unix/vncconfig/CMakeLists.txt b/unix/vncconfig/CMakeLists.txt
index c3823ab0..8734ff63 100644
--- a/unix/vncconfig/CMakeLists.txt
+++ b/unix/vncconfig/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${X11_INCLUDE_DIR})
+include_directories(SYSTEM ${X11_INCLUDE_DIR})
 
 include_directories(${CMAKE_SOURCE_DIR}/common)
 include_directories(${CMAKE_SOURCE_DIR}/unix/tx)
diff --git a/unix/x0vncserver/CMakeLists.txt b/unix/x0vncserver/CMakeLists.txt
index af824150..488a78fd 100644
--- a/unix/x0vncserver/CMakeLists.txt
+++ b/unix/x0vncserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${X11_INCLUDE_DIR})
+include_directories(SYSTEM ${X11_INCLUDE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/unix/common)
 include_directories(${CMAKE_SOURCE_DIR}/unix/tx)
 include_directories(${CMAKE_SOURCE_DIR}/unix)
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 87ab5f47..01b3a89c 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -1,5 +1,5 @@
-include_directories(${FLTK_INCLUDE_DIR})
-include_directories(${GETTEXT_INCLUDE_DIR})
+include_directories(SYSTEM ${FLTK_INCLUDE_DIR})
+include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR})
 
 include_directories(${CMAKE_SOURCE_DIR}/common)
 
-- 
2.39.5