CMake: use 'SYSTEM' for third-party include directories

This tells CMake to use `-isystem` for these directories instead of `-I`,
suppressing any compiler warnings in third-party code.

diff --git a/cmd/edgepaint/CMakeLists.txt b/cmd/edgepaint/CMakeLists.txt
index b9c678452b12942b118a2bf91bf3c3a40cfb8d93..f0485d209817e54cde342670c79b1b0b86244331 100644 (file)
--- a/cmd/edgepaint/CMakeLists.txt
+++ b/cmd/edgepaint/CMakeLists.txt
@@ -7,6 +7,9 @@ if(with_sfdp)
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/cdt
+  )
+
+  target_include_directories(edgepaint SYSTEM PRIVATE
     ${GETOPT_INCLUDE_DIRS}
   )
 

diff --git a/cmd/mingle/CMakeLists.txt b/cmd/mingle/CMakeLists.txt
index 5c447900a0f57ff2e6d8bac989bd1b7a0c9c0132..b1b57d9d059b7e9c50b0cf4974ab7c15b3dfe85c 100644 (file)
--- a/cmd/mingle/CMakeLists.txt
+++ b/cmd/mingle/CMakeLists.txt
@@ -10,6 +10,10 @@ if(with_sfdp AND ANN_FOUND)
       ${GRAPHVIZ_LIB_DIR}/cdt
       ${GRAPHVIZ_LIB_DIR}/cgraph
       ${GRAPHVIZ_LIB_DIR}/common
+  )
+
+  target_include_directories(mingle
+    SYSTEM PRIVATE
       ${GETOPT_INCLUDE_DIRS}
   )
 

diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 6bd41a839f293cb71c31b6a84b526f9343d3b9a4..c864e4cbe63f25ceb5b838904e8e77901e89058f 100644 (file)
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -50,6 +50,9 @@ function(add_simple_tool name)
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pack
     ${GRAPHVIZ_LIB_DIR}/pathplan
+  )
+
+  target_include_directories(${name} SYSTEM PRIVATE
     ${GETOPT_INCLUDE_DIRS}
   )
 
@@ -90,6 +93,9 @@ target_include_directories(dijkstra PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(dijkstra SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 
@@ -126,6 +132,9 @@ target_include_directories(gml2gv PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(gml2gv SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 
@@ -143,7 +152,10 @@ target_include_directories(gv2gml PRIVATE
   ${GRAPHVIZ_LIB_DIR}/common
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pathplan
-  ${GETOPT_INCLUDE_DIRS})
+)
+target_include_directories(gv2gml SYSTEM PRIVATE
+  ${GETOPT_INCLUDE_DIRS}
+)
 target_link_libraries(gv2gml cgraph gvc ingraphs)
 if(NOT HAVE_GETOPT_H)
   target_link_libraries(gv2gml ${GETOPT_LINK_LIBRARIES})
@@ -168,6 +180,9 @@ if(EXPAT_FOUND)
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pack
     ${GRAPHVIZ_LIB_DIR}/pathplan
+  )
+
+  target_include_directories(graphml2gv SYSTEM PRIVATE
     ${EXPAT_INCLUDE_DIRS}
     ${GETOPT_INCLUDE_DIRS}
   )
@@ -201,6 +216,9 @@ target_include_directories(gvcolor PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(gvcolor SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 
@@ -228,6 +246,9 @@ target_include_directories(gvgen PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(gvgen SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 
@@ -260,6 +281,9 @@ target_include_directories(gvpack PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(gvpack SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 
@@ -292,6 +316,9 @@ if(EXPAT_FOUND)
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pack
     ${GRAPHVIZ_LIB_DIR}/pathplan
+  )
+
+  target_include_directories(gxl2gv SYSTEM PRIVATE
     ${EXPAT_INCLUDE_DIRS}
     ${GETOPT_INCLUDE_DIRS}
   )
@@ -349,6 +376,9 @@ target_include_directories(mm2gv PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(mm2gv SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 
@@ -376,6 +406,9 @@ target_include_directories(sccmap PRIVATE
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
+)
+
+target_include_directories(sccmap SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index fad0bae9e7b4b15876d5ffcbcbed43efd5e2dc36..63afc1f656b839a7e9df630dfee3264aef403e2b 100644 (file)
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -120,6 +120,9 @@ target_include_directories(common_obj PRIVATE
   ${GRAPHVIZ_LIB_DIR}/pack
   ${GRAPHVIZ_LIB_DIR}/pathplan
   ${GRAPHVIZ_LIB_DIR}/xdot
+)
+
+target_include_directories(common_obj SYSTEM PRIVATE
   ${EXPAT_INCLUDE_DIRS}
 )
 

diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 85fbf59e7145f0cda978cef8bcb30528390a6b60..cef991911b269f3899821898a57ac3f912993163 100644 (file)
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -63,7 +63,7 @@ target_link_libraries(gvc PUBLIC
 )
 
 if(LTDL_FOUND)
-  target_include_directories(gvc PRIVATE ${LTDL_INCLUDE_DIRS})
+  target_include_directories(gvc SYSTEM PRIVATE ${LTDL_INCLUDE_DIRS})
   if(NOT WIN32 OR MINGW)
     target_link_libraries(gvc PUBLIC ${LTDL_LIBRARIES})
   endif()

diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt
index b60e0a3bdc899c51d871be2deed69977f9d5fabd..9f8f1c83510a823fbc0292e9a4bb411286c1b3de 100644 (file)
--- a/lib/gvpr/CMakeLists.txt
+++ b/lib/gvpr/CMakeLists.txt
@@ -32,6 +32,9 @@ target_include_directories(gvpr PRIVATE
   ${GRAPHVIZ_LIB_DIR}/cgraph
   ${GRAPHVIZ_LIB_DIR}/common
   ${GRAPHVIZ_LIB_DIR}/expr
+)
+
+target_include_directories(gvpr SYSTEM PRIVATE
   ${GETOPT_INCLUDE_DIRS}
 )
 

diff --git a/lib/mingle/CMakeLists.txt b/lib/mingle/CMakeLists.txt
index 0a860576d6c36fc61d93a9ca290f5707c521b2a9..ae1b825f5d2ae1cc6b8ac293fc44a7c69ebbe905 100644 (file)
--- a/lib/mingle/CMakeLists.txt
+++ b/lib/mingle/CMakeLists.txt
@@ -23,6 +23,9 @@ if(ANN_FOUND)
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pathplan
+  )
+
+  target_include_directories(libmingle SYSTEM PRIVATE
     ${ANN_INCLUDE_DIR}
   )
 

diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt
index fbe38c8156b81d94fa676758596882e4d6e29c9d..b808478bf6c982d029c5736d34091c871c62fc00 100644 (file)
--- a/plugin/gd/CMakeLists.txt
+++ b/plugin/gd/CMakeLists.txt
@@ -19,6 +19,9 @@ if(GD_FOUND)
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pathplan
+  )
+
+  target_include_directories(gvplugin_gd SYSTEM PRIVATE
     ${GD_INCLUDE_DIRS}
   )
 

diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt
index 5f47ace1454c88ba7d938dd606f2aa72fd6748b0..f0d3fb9e65b682fe2e66caed7e7e1749733490fa 100644 (file)
--- a/plugin/pango/CMakeLists.txt
+++ b/plugin/pango/CMakeLists.txt
@@ -22,6 +22,9 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND)
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pathplan
+  )
+
+  target_include_directories(gvplugin_pango SYSTEM PRIVATE
     ${CAIRO_INCLUDE_DIRS}/cairo
     ${PANGOCAIRO_INCLUDE_DIRS}
   )