From c95f4d6014f60b24aa80e6bad4e5d3f3e8f08b6e Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 2 Apr 2022 10:45:45 -0700 Subject: [PATCH] CMake: remove 'GRAPHVIZ_LIB_DIR' `target_include_directories` supports relative paths that are interpreted relative to the current source directory. So we can write these paths shorter and more obviously. --- CMakeLists.txt | 1 - cmd/dot/CMakeLists.txt | 12 +-- cmd/edgepaint/CMakeLists.txt | 8 +- cmd/gvpr/CMakeLists.txt | 8 +- cmd/mingle/CMakeLists.txt | 8 +- cmd/smyrna/CMakeLists.txt | 16 +-- cmd/tools/CMakeLists.txt | 152 ++++++++++++++--------------- contrib/diffimg/CMakeLists.txt | 2 +- lib/ast/CMakeLists.txt | 2 +- lib/cdt/CMakeLists.txt | 2 +- lib/cgraph++/CMakeLists.txt | 6 +- lib/cgraph/CMakeLists.txt | 4 +- lib/circogen/CMakeLists.txt | 14 +-- lib/common/CMakeLists.txt | 14 +-- lib/dotgen/CMakeLists.txt | 14 +-- lib/edgepaint/CMakeLists.txt | 12 +-- lib/expr/CMakeLists.txt | 10 +- lib/fdpgen/CMakeLists.txt | 14 +-- lib/glcomp/CMakeLists.txt | 4 +- lib/gvc++/CMakeLists.txt | 14 +-- lib/gvc/CMakeLists.txt | 10 +- lib/gvpr/CMakeLists.txt | 12 +-- lib/ingraphs/CMakeLists.txt | 6 +- lib/label/CMakeLists.txt | 8 +- lib/mingle/CMakeLists.txt | 12 +-- lib/neatogen/CMakeLists.txt | 14 +-- lib/ortho/CMakeLists.txt | 14 +-- lib/osage/CMakeLists.txt | 14 +-- lib/pack/CMakeLists.txt | 12 +-- lib/patchwork/CMakeLists.txt | 14 +-- lib/pathplan/CMakeLists.txt | 2 +- lib/rbtree/CMakeLists.txt | 2 +- lib/sfdpgen/CMakeLists.txt | 14 +-- lib/sfio/CMakeLists.txt | 2 +- lib/sparse/CMakeLists.txt | 8 +- lib/topfish/CMakeLists.txt | 4 +- lib/twopigen/CMakeLists.txt | 14 +-- lib/vmalloc/CMakeLists.txt | 2 +- lib/vpsc/CMakeLists.txt | 2 +- lib/xdot/CMakeLists.txt | 2 +- plugin/core/CMakeLists.txt | 16 +-- plugin/devil/CMakeLists.txt | 12 +-- plugin/dot_layout/CMakeLists.txt | 12 +-- plugin/gd/CMakeLists.txt | 12 +-- plugin/gdiplus/CMakeLists.txt | 12 +-- plugin/neato_layout/CMakeLists.txt | 12 +-- plugin/pango/CMakeLists.txt | 12 +-- plugin/webp/CMakeLists.txt | 12 +-- plugin/xlib/CMakeLists.txt | 12 +-- tests/CMakeLists.txt | 16 +-- 50 files changed, 306 insertions(+), 307 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d5613938..dca363b3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,6 @@ set(PKGCONFIG_DIR ${LIBRARY_INSTALL_DIR}/pkgconfig) # set(MAN_PDF_INSTALL_DIR share/graphviz/doc/pdf) set(TOP_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(TOP_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") -set(GRAPHVIZ_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib") set(WINDOWS_DEPENDENCY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries") set(WINDOWS_DEPENDENCY_VCPKG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries/vcpkg/installed") if(CMAKE_CL_64) diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt index e354b6472..547ec0700 100644 --- a/cmd/dot/CMakeLists.txt +++ b/cmd/dot/CMakeLists.txt @@ -1,13 +1,13 @@ add_definitions(-DDEMAND_LOADING=1) include_directories( - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) add_executable(dot diff --git a/cmd/edgepaint/CMakeLists.txt b/cmd/edgepaint/CMakeLists.txt index f0485d209..4fe5637e5 100644 --- a/cmd/edgepaint/CMakeLists.txt +++ b/cmd/edgepaint/CMakeLists.txt @@ -3,10 +3,10 @@ if(with_sfdp) add_executable(edgepaint edgepaintmain.c) target_include_directories(edgepaint PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/cdt + ../../lib + ../../lib/common + ../../lib/cgraph + ../../lib/cdt ) target_include_directories(edgepaint SYSTEM PRIVATE diff --git a/cmd/gvpr/CMakeLists.txt b/cmd/gvpr/CMakeLists.txt index d6a1e9a8c..339cd6263 100644 --- a/cmd/gvpr/CMakeLists.txt +++ b/cmd/gvpr/CMakeLists.txt @@ -6,10 +6,10 @@ add_executable(gvpr-bin ) target_include_directories(gvpr-bin PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/gvpr + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/gvpr ) target_link_libraries(gvpr-bin diff --git a/cmd/mingle/CMakeLists.txt b/cmd/mingle/CMakeLists.txt index b1b57d9d0..3a8811349 100644 --- a/cmd/mingle/CMakeLists.txt +++ b/cmd/mingle/CMakeLists.txt @@ -6,10 +6,10 @@ if(with_sfdp AND ANN_FOUND) target_include_directories(mingle PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/common ) target_include_directories(mingle diff --git a/cmd/smyrna/CMakeLists.txt b/cmd/smyrna/CMakeLists.txt index 59fa5a863..6621bea4b 100644 --- a/cmd/smyrna/CMakeLists.txt +++ b/cmd/smyrna/CMakeLists.txt @@ -75,14 +75,14 @@ if(with_smyrna) target_include_directories(smyrna PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/gvpr - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/xdot + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/gvpr + ../../lib/pathplan + ../../lib/xdot gui ) diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt index 0e9fd8838..8ec1212f8 100644 --- a/cmd/tools/CMakeLists.txt +++ b/cmd/tools/CMakeLists.txt @@ -41,15 +41,15 @@ function(add_simple_tool name) add_executable(${name} ${name}.c) target_include_directories(${name} PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(${name} SYSTEM PRIVATE @@ -84,15 +84,15 @@ add_executable(dijkstra ) target_include_directories(dijkstra PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(dijkstra SYSTEM PRIVATE @@ -123,15 +123,15 @@ add_executable(gml2gv ) target_include_directories(gml2gv PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(gml2gv SYSTEM PRIVATE @@ -146,12 +146,12 @@ tool_defaults(gml2gv) add_executable(gv2gml gv2gml.c) target_include_directories(gv2gml PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_include_directories(gv2gml SYSTEM PRIVATE ${GETOPT_INCLUDE_DIRS} @@ -171,15 +171,15 @@ if(EXPAT_FOUND) ) target_include_directories(graphml2gv PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(graphml2gv SYSTEM PRIVATE @@ -207,15 +207,15 @@ add_executable(gvcolor ) target_include_directories(gvcolor PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(gvcolor SYSTEM PRIVATE @@ -237,15 +237,15 @@ add_executable(gvgen ) target_include_directories(gvgen PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(gvgen SYSTEM PRIVATE @@ -272,15 +272,15 @@ add_executable(gvpack ) target_include_directories(gvpack PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(gvpack SYSTEM PRIVATE @@ -307,15 +307,15 @@ if(EXPAT_FOUND) ) target_include_directories(gxl2gv PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(gxl2gv SYSTEM PRIVATE @@ -367,15 +367,15 @@ add_executable(mm2gv ) target_include_directories(mm2gv PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(mm2gv SYSTEM PRIVATE @@ -397,15 +397,15 @@ add_executable(sccmap ) target_include_directories(sccmap PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pack + ../../lib/pathplan ) target_include_directories(sccmap SYSTEM PRIVATE diff --git a/contrib/diffimg/CMakeLists.txt b/contrib/diffimg/CMakeLists.txt index 17c44b1fb..8d1f3874f 100644 --- a/contrib/diffimg/CMakeLists.txt +++ b/contrib/diffimg/CMakeLists.txt @@ -3,7 +3,7 @@ find_package(GD) if(GD_FOUND) add_executable(diffimg diffimg.c) - target_include_directories(diffimg PRIVATE ${GRAPHVIZ_LIB_DIR}) + target_include_directories(diffimg PRIVATE ../../lib) target_include_directories(diffimg SYSTEM PRIVATE ${GD_INCLUDE_DIRS}) target_link_libraries(diffimg ${GD_LIBRARIES}) diff --git a/lib/ast/CMakeLists.txt b/lib/ast/CMakeLists.txt index 1814b337d..fd2f7a420 100644 --- a/lib/ast/CMakeLists.txt +++ b/lib/ast/CMakeLists.txt @@ -22,5 +22,5 @@ add_library(ast STATIC ) target_include_directories(ast PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ) diff --git a/lib/cdt/CMakeLists.txt b/lib/cdt/CMakeLists.txt index 5db9dad01..37cce33b2 100644 --- a/lib/cdt/CMakeLists.txt +++ b/lib/cdt/CMakeLists.txt @@ -25,7 +25,7 @@ add_library(cdt SHARED ) target_include_directories(cdt PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR}) # Installation location of library files diff --git a/lib/cgraph++/CMakeLists.txt b/lib/cgraph++/CMakeLists.txt index de8962125..710c87aa0 100644 --- a/lib/cgraph++/CMakeLists.txt +++ b/lib/cgraph++/CMakeLists.txt @@ -6,9 +6,9 @@ set_property(TARGET cgraph++ PROPERTY CXX_STANDARD 20) set_property(TARGET cgraph++ PROPERTY CXX_STANDARD_REQUIRED ON) target_include_directories(cgraph++ PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph + .. + ../cdt + ../cgraph ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt index f5220caa6..ac298b7f9 100644 --- a/lib/cgraph/CMakeLists.txt +++ b/lib/cgraph/CMakeLists.txt @@ -51,8 +51,8 @@ add_library(cgraph SHARED ) target_include_directories(cgraph PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt + .. + ../cdt ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt index 6590d5bb6..c1b40227c 100644 --- a/lib/circogen/CMakeLists.txt +++ b/lib/circogen/CMakeLists.txt @@ -25,13 +25,13 @@ add_library(circogen STATIC ) target_include_directories(circogen PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan) + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan) target_link_libraries(circogen PRIVATE cgraph diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt index 63afc1f65..493e60c63 100644 --- a/lib/common/CMakeLists.txt +++ b/lib/common/CMakeLists.txt @@ -111,15 +111,15 @@ add_library(common_obj OBJECT ) target_include_directories(common_obj PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/xdot + ../cdt + ../cgraph + ../gvc + ../pack + ../pathplan + ../xdot ) target_include_directories(common_obj SYSTEM PRIVATE diff --git a/lib/dotgen/CMakeLists.txt b/lib/dotgen/CMakeLists.txt index 0722dc08d..d90ca3650 100644 --- a/lib/dotgen/CMakeLists.txt +++ b/lib/dotgen/CMakeLists.txt @@ -24,13 +24,13 @@ add_library(dotgen STATIC ) target_include_directories(dotgen PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(dotgen PRIVATE diff --git a/lib/edgepaint/CMakeLists.txt b/lib/edgepaint/CMakeLists.txt index 344f22e22..97bb08d5d 100644 --- a/lib/edgepaint/CMakeLists.txt +++ b/lib/edgepaint/CMakeLists.txt @@ -17,12 +17,12 @@ add_library(edgepaintlib STATIC ) target_include_directories(edgepaintlib PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pathplan ) # work around needed for an object library diff --git a/lib/expr/CMakeLists.txt b/lib/expr/CMakeLists.txt index ac1b1efbc..5d2b958be 100644 --- a/lib/expr/CMakeLists.txt +++ b/lib/expr/CMakeLists.txt @@ -40,11 +40,11 @@ add_library(expr STATIC ) target_include_directories(expr PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. # needed to find generated expr/y.tab.h - ${GRAPHVIZ_LIB_DIR}/ast - ${GRAPHVIZ_LIB_DIR}/vmalloc - ${GRAPHVIZ_LIB_DIR}/sfio - ${GRAPHVIZ_LIB_DIR}/cdt + ../ast + ../vmalloc + ../sfio + ../cdt ) diff --git a/lib/fdpgen/CMakeLists.txt b/lib/fdpgen/CMakeLists.txt index a30ae557d..ddd29f164 100644 --- a/lib/fdpgen/CMakeLists.txt +++ b/lib/fdpgen/CMakeLists.txt @@ -22,13 +22,13 @@ add_library(fdpgen STATIC ) target_include_directories(fdpgen PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(fdpgen PRIVATE diff --git a/lib/glcomp/CMakeLists.txt b/lib/glcomp/CMakeLists.txt index 152a068f3..e11b9d9c1 100644 --- a/lib/glcomp/CMakeLists.txt +++ b/lib/glcomp/CMakeLists.txt @@ -36,8 +36,8 @@ if(with_smyrna) ) target_include_directories(glcomp PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/common + .. + ../common ) target_include_directories(glcomp SYSTEM PRIVATE diff --git a/lib/gvc++/CMakeLists.txt b/lib/gvc++/CMakeLists.txt index 3ffe9bede..3214304f3 100644 --- a/lib/gvc++/CMakeLists.txt +++ b/lib/gvc++/CMakeLists.txt @@ -11,14 +11,14 @@ set_target_properties(gvc++ PROPERTIES CXX_STANDARD 20) set_target_properties(gvc++ PROPERTIES CXX_STANDARD_REQUIRED ON) target_include_directories(gvc++ PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/cgraph++ - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../cdt + ../cgraph + ../cgraph++ + ../common + ../gvc + ../pathplan ) target_link_libraries(gvc++ PUBLIC diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt index cef991911..f15355274 100644 --- a/lib/gvc/CMakeLists.txt +++ b/lib/gvc/CMakeLists.txt @@ -35,12 +35,12 @@ add_library(gvc SHARED target_include_directories(gvc PUBLIC - $ + $ $ - $ - $ - $ - $ + $ + $ + $ + $ $ PRIVATE ${TOP_SOURCE_DIR} diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt index 9f8f1c835..58828a8ad 100644 --- a/lib/gvpr/CMakeLists.txt +++ b/lib/gvpr/CMakeLists.txt @@ -22,16 +22,16 @@ add_library(gvpr STATIC ) target_include_directories(gvpr PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. # needed to find generated expr/exparse.h ${CMAKE_CURRENT_BINARY_DIR}/../common # needed to find generated common/colortbl.h - ${GRAPHVIZ_LIB_DIR}/ast - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/expr + ../ast + ../cdt + ../cgraph + ../common + ../expr ) target_include_directories(gvpr SYSTEM PRIVATE diff --git a/lib/ingraphs/CMakeLists.txt b/lib/ingraphs/CMakeLists.txt index 091fc7840..ed3b5b137 100644 --- a/lib/ingraphs/CMakeLists.txt +++ b/lib/ingraphs/CMakeLists.txt @@ -7,9 +7,9 @@ add_library(ingraphs STATIC ) target_include_directories(ingraphs PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph + .. + ../cdt + ../cgraph ) target_link_libraries(ingraphs PRIVATE diff --git a/lib/label/CMakeLists.txt b/lib/label/CMakeLists.txt index 7e421d573..a9f690150 100644 --- a/lib/label/CMakeLists.txt +++ b/lib/label/CMakeLists.txt @@ -17,10 +17,10 @@ add_library(label STATIC ) target_include_directories(label PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common + .. + ../cdt + ../cgraph + ../common ) target_link_libraries(label PRIVATE diff --git a/lib/mingle/CMakeLists.txt b/lib/mingle/CMakeLists.txt index ae1b825f5..181c35c5d 100644 --- a/lib/mingle/CMakeLists.txt +++ b/lib/mingle/CMakeLists.txt @@ -17,12 +17,12 @@ if(ANN_FOUND) ) target_include_directories(libmingle PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pathplan ) target_include_directories(libmingle SYSTEM PRIVATE diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt index 039cfca9b..d597c457a 100644 --- a/lib/neatogen/CMakeLists.txt +++ b/lib/neatogen/CMakeLists.txt @@ -93,13 +93,13 @@ add_library(neatogen STATIC ) target_include_directories(neatogen PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(neatogen PRIVATE diff --git a/lib/ortho/CMakeLists.txt b/lib/ortho/CMakeLists.txt index 336a27e75..ff9730867 100644 --- a/lib/ortho/CMakeLists.txt +++ b/lib/ortho/CMakeLists.txt @@ -24,13 +24,13 @@ add_library(ortho_obj OBJECT ) target_include_directories(ortho_obj PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) add_library(ortho STATIC diff --git a/lib/osage/CMakeLists.txt b/lib/osage/CMakeLists.txt index 6b48b989c..ec8f560f5 100644 --- a/lib/osage/CMakeLists.txt +++ b/lib/osage/CMakeLists.txt @@ -9,13 +9,13 @@ add_library(osage STATIC ) target_include_directories(osage PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(osage PRIVATE diff --git a/lib/pack/CMakeLists.txt b/lib/pack/CMakeLists.txt index 31f5315e9..b667691b9 100644 --- a/lib/pack/CMakeLists.txt +++ b/lib/pack/CMakeLists.txt @@ -10,13 +10,13 @@ add_library(pack_obj OBJECT ) target_include_directories(pack_obj PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../cdt + ../cgraph + ../common + ../gvc + ../pathplan ) add_library(pack STATIC diff --git a/lib/patchwork/CMakeLists.txt b/lib/patchwork/CMakeLists.txt index 1d43c5975..d2e503694 100644 --- a/lib/patchwork/CMakeLists.txt +++ b/lib/patchwork/CMakeLists.txt @@ -10,13 +10,13 @@ add_library(patchwork STATIC ) target_include_directories(patchwork PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(patchwork PRIVATE diff --git a/lib/pathplan/CMakeLists.txt b/lib/pathplan/CMakeLists.txt index 821ec73b8..592c58e26 100644 --- a/lib/pathplan/CMakeLists.txt +++ b/lib/pathplan/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(pathplan SHARED ) target_include_directories(pathplan PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/lib/rbtree/CMakeLists.txt b/lib/rbtree/CMakeLists.txt index 84511e252..961ec2492 100644 --- a/lib/rbtree/CMakeLists.txt +++ b/lib/rbtree/CMakeLists.txt @@ -10,5 +10,5 @@ add_library(rbtree STATIC ) include_directories(rbtree PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ) diff --git a/lib/sfdpgen/CMakeLists.txt b/lib/sfdpgen/CMakeLists.txt index b87e9cd7c..a562422e4 100644 --- a/lib/sfdpgen/CMakeLists.txt +++ b/lib/sfdpgen/CMakeLists.txt @@ -26,13 +26,13 @@ add_library(sfdpgen STATIC ) target_include_directories(sfdpgen PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(sfdpgen PRIVATE diff --git a/lib/sfio/CMakeLists.txt b/lib/sfio/CMakeLists.txt index 2a770bfcb..e968f641d 100644 --- a/lib/sfio/CMakeLists.txt +++ b/lib/sfio/CMakeLists.txt @@ -41,6 +41,6 @@ add_library(sfio STATIC ) target_include_directories(sfio PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ) diff --git a/lib/sparse/CMakeLists.txt b/lib/sparse/CMakeLists.txt index 7cd11c142..d619d49d1 100644 --- a/lib/sparse/CMakeLists.txt +++ b/lib/sparse/CMakeLists.txt @@ -27,10 +27,10 @@ add_library(sparse STATIC ) target_include_directories(sparse PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common + .. + ../cdt + ../cgraph + ../common ) target_link_libraries(sparse diff --git a/lib/topfish/CMakeLists.txt b/lib/topfish/CMakeLists.txt index eebf871c1..5bfe1ba81 100644 --- a/lib/topfish/CMakeLists.txt +++ b/lib/topfish/CMakeLists.txt @@ -10,8 +10,8 @@ if(with_smyrna) ) target_include_directories(topfish PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/common + .. + ../common ) target_link_libraries(topfish PRIVATE diff --git a/lib/twopigen/CMakeLists.txt b/lib/twopigen/CMakeLists.txt index a9b135ca5..b945a20e3 100644 --- a/lib/twopigen/CMakeLists.txt +++ b/lib/twopigen/CMakeLists.txt @@ -10,13 +10,13 @@ add_library(twopigen STATIC ) target_include_directories(twopigen PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan + .. + ../cdt + ../cgraph + ../common + ../gvc + ../pack + ../pathplan ) target_link_libraries(twopigen PRIVATE diff --git a/lib/vmalloc/CMakeLists.txt b/lib/vmalloc/CMakeLists.txt index cd5a687c4..af428f89b 100644 --- a/lib/vmalloc/CMakeLists.txt +++ b/lib/vmalloc/CMakeLists.txt @@ -11,5 +11,5 @@ add_library(vmalloc STATIC ) target_include_directories(vmalloc PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ) diff --git a/lib/vpsc/CMakeLists.txt b/lib/vpsc/CMakeLists.txt index 077f1d976..7c2e7a8d9 100644 --- a/lib/vpsc/CMakeLists.txt +++ b/lib/vpsc/CMakeLists.txt @@ -24,7 +24,7 @@ add_library(vpsc STATIC ) target_include_directories(vpsc PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ) endif() diff --git a/lib/xdot/CMakeLists.txt b/lib/xdot/CMakeLists.txt index b327b8e58..e0d624595 100644 --- a/lib/xdot/CMakeLists.txt +++ b/lib/xdot/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(xdot SHARED ) target_include_directories(xdot PRIVATE - ${GRAPHVIZ_LIB_DIR} + .. ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/plugin/core/CMakeLists.txt b/plugin/core/CMakeLists.txt index 01e84ac93..0a1be67ce 100644 --- a/plugin/core/CMakeLists.txt +++ b/plugin/core/CMakeLists.txt @@ -19,16 +19,16 @@ add_library(gvplugin_core SHARED ) target_include_directories(gvplugin_core PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/gvpr - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/xdot + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/gvpr + ../../lib/pathplan + ../../lib/xdot ) target_link_libraries(gvplugin_core diff --git a/plugin/devil/CMakeLists.txt b/plugin/devil/CMakeLists.txt index 004f571bd..2f595c99d 100644 --- a/plugin/devil/CMakeLists.txt +++ b/plugin/devil/CMakeLists.txt @@ -9,12 +9,12 @@ if(PANGOCAIRO_FOUND AND DevIL_FOUND) ) target_include_directories(gvplugin_devil PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_include_directories(gvplugin_devil SYSTEM PRIVATE diff --git a/plugin/dot_layout/CMakeLists.txt b/plugin/dot_layout/CMakeLists.txt index 399529413..c77004655 100644 --- a/plugin/dot_layout/CMakeLists.txt +++ b/plugin/dot_layout/CMakeLists.txt @@ -5,13 +5,13 @@ add_library(gvplugin_dot_layout SHARED ) target_include_directories(gvplugin_dot_layout PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_link_libraries(gvplugin_dot_layout diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt index b808478bf..047f29b15 100644 --- a/plugin/gd/CMakeLists.txt +++ b/plugin/gd/CMakeLists.txt @@ -12,13 +12,13 @@ if(GD_FOUND) ) target_include_directories(gvplugin_gd PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_include_directories(gvplugin_gd SYSTEM PRIVATE diff --git a/plugin/gdiplus/CMakeLists.txt b/plugin/gdiplus/CMakeLists.txt index a99dd7198..3a987df74 100644 --- a/plugin/gdiplus/CMakeLists.txt +++ b/plugin/gdiplus/CMakeLists.txt @@ -15,13 +15,13 @@ if(WIN32) ) target_include_directories(gvplugin_gdiplus PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_link_libraries(gvplugin_gdiplus diff --git a/plugin/neato_layout/CMakeLists.txt b/plugin/neato_layout/CMakeLists.txt index 3d5642315..09ab74c91 100644 --- a/plugin/neato_layout/CMakeLists.txt +++ b/plugin/neato_layout/CMakeLists.txt @@ -5,13 +5,13 @@ add_library(gvplugin_neato_layout SHARED ) target_include_directories(gvplugin_neato_layout PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_link_libraries(gvplugin_neato_layout diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt index f0d3fb9e6..d2c6a5311 100644 --- a/plugin/pango/CMakeLists.txt +++ b/plugin/pango/CMakeLists.txt @@ -14,14 +14,14 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND) ) target_include_directories(gvplugin_pango PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../../lib ${CMAKE_CURRENT_SOURCE_DIR} ${TOP_BINARY_DIR}/lib/common - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_include_directories(gvplugin_pango SYSTEM PRIVATE diff --git a/plugin/webp/CMakeLists.txt b/plugin/webp/CMakeLists.txt index cade39dbb..3c7f0924d 100644 --- a/plugin/webp/CMakeLists.txt +++ b/plugin/webp/CMakeLists.txt @@ -12,12 +12,12 @@ if(WEBP_FOUND) ) target_include_directories(gvplugin_webp PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_include_directories(gvplugin_webp SYSTEM PRIVATE diff --git a/plugin/xlib/CMakeLists.txt b/plugin/xlib/CMakeLists.txt index 682d10601..f6fe71f73 100644 --- a/plugin/xlib/CMakeLists.txt +++ b/plugin/xlib/CMakeLists.txt @@ -13,12 +13,12 @@ if(PANGOCAIRO_FOUND AND X11_FOUND AND XRENDER_FOUND) ) target_include_directories(gvplugin_xlib PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../../lib + ../../lib/cdt + ../../lib/cgraph + ../../lib/common + ../../lib/gvc + ../../lib/pathplan ) target_include_directories(gvplugin_xlib PRIVATE SYSTEM diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index badde15dc..8ce8b339a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(test_common STATIC set_target_properties(test_common PROPERTIES CXX_STANDARD 20) set_target_properties(test_common PROPERTIES CXX_STANDARD_REQUIRED ON) target_include_directories(test_common PRIVATE - ${GRAPHVIZ_LIB_DIR} + ../lib ) target_include_directories(test_common SYSTEM PRIVATE ${Boost_INCLUDE_DIRS} @@ -50,13 +50,13 @@ macro(CREATE_TEST testname) add_test(NAME test_${testname} COMMAND test_${testname} --reporter junit --out test_${testname}.xml) target_include_directories(test_${testname} PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/cgraph++ - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ../lib + ../lib/cdt + ../lib/cgraph + ../lib/cgraph++ + ../lib/common + ../lib/gvc + ../lib/pathplan ) target_link_libraries(test_${testname} PRIVATE test_common -- 2.40.0