Mark system include paths correctly

This makes sure the compiler doesn't complain about problems in those
files.

diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
index 7f642b4805e76f5b0bdf4cc96dd83060778c62a8..429d0c72a2c0aa792f9fb6a93a142ca6cab27669 100644 (file)
--- 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 b7ac1145c9c6c48962a07d6b7ff7929c4fa6ecb8..e18cff343cfea9c281450f4b1121dca08d9ad370 100644 (file)
--- 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 70ffe7777f9ee41aac9094c3313308140ed46f89..562adfc0a9a538cf08ac3409ceb954404f10d994 100644 (file)
--- 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 6daecba503792dc0e1799bc8461b58819b32bcad..00f38b76b1aea305b8f2fc36a005ea58dc0242e1 100644 (file)
--- 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 67976150f9b440361a50576bb7b31aa1bc98cc55..e913de3c3e13dfbdbd57c79e2bd42cc2ab7a111c 100644 (file)
--- 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 c3823ab0347491b2aca32769a2f5b6055b624ba2..8734ff63c8c1add9711bb4188531100f34dfc3ac 100644 (file)
--- 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 af8241506aabdcdafd7437f7c2a09ab7ca027646..488a78fd53b4907b7ae68fdb73a6edcabf44964b 100644 (file)
--- 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 87ab5f47b1ca5f45160a48beb5737ebae4019108..01b3a89c9f6a8aedb6c81fcc23181be3dbc7ffde 100644 (file)
--- 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)