From 957f4ae5e70c2342c3e1e1359c6aed85f9a25b7f Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 26 Mar 2022 11:37:29 -0700 Subject: [PATCH] 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. --- cmd/edgepaint/CMakeLists.txt | 3 +++ cmd/mingle/CMakeLists.txt | 4 ++++ cmd/tools/CMakeLists.txt | 35 ++++++++++++++++++++++++++++++++++- lib/common/CMakeLists.txt | 3 +++ lib/gvc/CMakeLists.txt | 2 +- lib/gvpr/CMakeLists.txt | 3 +++ lib/mingle/CMakeLists.txt | 3 +++ plugin/gd/CMakeLists.txt | 3 +++ plugin/pango/CMakeLists.txt | 3 +++ 9 files changed, 57 insertions(+), 2 deletions(-) diff --git a/cmd/edgepaint/CMakeLists.txt b/cmd/edgepaint/CMakeLists.txt index b9c678452..f0485d209 100644 --- 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 5c447900a..b1b57d9d0 100644 --- 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 6bd41a839..c864e4cbe 100644 --- 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 fad0bae9e..63afc1f65 100644 --- 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 85fbf59e7..cef991911 100644 --- 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 b60e0a3bd..9f8f1c835 100644 --- 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 0a860576d..ae1b825f5 100644 --- 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 fbe38c815..b808478bf 100644 --- 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 5f47ace14..f0d3fb9e6 100644 --- 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} ) -- 2.50.1