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.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d5613938e2e3bbe1aa4d8ae814d3d6c34fc1bba..dca363b3aca39ba9e552783389dada52ff6ed829 100644 (file)
--- 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 e354b6472b85cf9f0ffb5bfc74ee8da352b11fed..547ec0700f0a8caa3b307575b17e8efed4f69ac9 100644 (file)
--- 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 f0485d209817e54cde342670c79b1b0b86244331..4fe5637e58c0de33824a9c46f01600625e1b54e2 100644 (file)
--- 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 d6a1e9a8c804b6a00f794a2f112e21a55668e42c..339cd6263ccbbe0426eee6e8cfb19af74632bae5 100644 (file)
--- 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 b1b57d9d059b7e9c50b0cf4974ab7c15b3dfe85c..3a88113491bb42678f7d1ef5687647685b2858b0 100644 (file)
--- 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 59fa5a86347d21b83d33ff739b30ff2e682a6e5a..6621bea4b86ecf0371eb7411818130f9eb73b2aa 100644 (file)
--- 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 0e9fd883877e31a25486a840dbcac06ffe286348..8ec1212f8a3140da9c7366f2de97ef5a5a66ff9c 100644 (file)
--- 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 17c44b1fb468398a96bbb3c079243ac22b46ccd0..8d1f3874fe20983fcafbebb8aaa0055b188e06b2 100644 (file)
--- 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 1814b337d2975ff7ff0206b0b190263b9e12c0ab..fd2f7a4209f4c3a9b65e2f956088254c3090b09c 100644 (file)
--- 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 5db9dad0153c806e4c81221f8edfd07da0d95ce7..37cce33b2c9da844fd3a4492c90f44be59e2ba35 100644 (file)
--- 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 de896212523a392de4bd046e85566a32d6d12fcd..710c87aa030de26119378334d48e5977f8c48311 100644 (file)
--- 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 f5220caa69c87c947d25731580927e35c1766dc1..ac298b7f9cf0d365463864e6527fbe287df3f3a4 100644 (file)
--- 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 6590d5bb61149f0bf65753dde72a2e94de2b89d5..c1b40227c05215c7c3878a78dd183e56b8f96d1d 100644 (file)
--- 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 63afc1f656b839a7e9df630dfee3264aef403e2b..493e60c63f7e728e63d86d3b15dceb9645b73a7c 100644 (file)
--- 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 0722dc08d8a1dd6805526b7a76a5df78ebab18da..d90ca3650102264e37375a0447e65db7ac4cc931 100644 (file)
--- 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 344f22e225eba19312d55a542926b818b477cf2c..97bb08d5df98a6f2d16d3999c31b7bd1c6c05254 100644 (file)
--- 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 ac1b1efbc1a3a50cb7e8badbc53718e2140da3a7..5d2b958bea654d66b575db3d27f0b76c3b2845e3 100644 (file)
--- 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 a30ae557d2034a14128a3562c1e22e0ab7241327..ddd29f164b6b1a819b72ce92ad349baab2c5f3bf 100644 (file)
--- 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 152a068f3bd57a878d5b8bef750c315bff7086e4..e11b9d9c1f1d72911bda6514bdec452c98d8f9a0 100644 (file)
--- 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 3ffe9bede7f2fc87c2805759453a7d0d8cbd0143..3214304f3f4400554e2e129ee4e98981e560ce04 100644 (file)
--- 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 cef991911b269f3899821898a57ac3f912993163..f15355274b09561350813542906647dbdf58e99b 100644 (file)
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -35,12 +35,12 @@ add_library(gvc SHARED
 
 target_include_directories(gvc
   PUBLIC
-    $<BUILD_INTERFACE:${GRAPHVIZ_LIB_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${GRAPHVIZ_LIB_DIR}/cdt>
-    $<BUILD_INTERFACE:${GRAPHVIZ_LIB_DIR}/cgraph>
-    $<BUILD_INTERFACE:${GRAPHVIZ_LIB_DIR}/common>
-    $<BUILD_INTERFACE:${GRAPHVIZ_LIB_DIR}/pathplan>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cdt>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cgraph>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../common>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../pathplan>
     $<INSTALL_INTERFACE:include/graphviz>
   PRIVATE
     ${TOP_SOURCE_DIR}

diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt
index 9f8f1c83510a823fbc0292e9a4bb411286c1b3de..58828a8ad3002c67b347a96c39a6981389cffd71 100644 (file)
--- 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 091fc78409f554750dc549e97f91199f4805837a..ed3b5b137918d13c64334ee5caaeb1a7b3edf964 100644 (file)
--- 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 7e421d573439d2e8d943d57058bb66a1a5eb5cdc..a9f6901506ecc6207d4718726bc6a0730abbac1a 100644 (file)
--- 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 ae1b825f5d2ae1cc6b8ac293fc44a7c69ebbe905..181c35c5daa4986d511739d81d2c88562ec6bc8e 100644 (file)
--- 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 039cfca9b0a0dbd58cb58fdc7c2017e4b5190b2a..d597c457a7cc45e87d6311a4003721fbfc5dec20 100644 (file)
--- 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 336a27e7570d00f5e6b92583300865f65ad94c57..ff9730867ce3a1766634b18d8014a8174092cdec 100644 (file)
--- 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 6b48b989cb69d0a75eab1523b74bce51e6591d02..ec8f560f5ceb4cfe2ae93938d7b640e9357c1912 100644 (file)
--- 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 31f5315e9d5ec065697f343858cc954d6135eb78..b667691b94c3cda3e538568c7825d0d7cd4f0ef3 100644 (file)
--- 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 1d43c597590a1abd8a6cc6f45027e76a603ae72e..d2e5036947e6db912bf7daa077c17fa3021a6366 100644 (file)
--- 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 821ec73b8b2edb24da243350e8487c64a1529f07..592c58e26247fdd71bde47a654d69c7c6b7f5545 100644 (file)
--- 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 84511e2526da2f96f3add292f6c49e873299317f..961ec249276fba5d97a71bd5b84ba7dd2ac81f96 100644 (file)
--- 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 b87e9cd7c5df467e372ebd198d9444eb04a91d02..a562422e493270c02e27447e84f4a1b33b0f20f9 100644 (file)
--- 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 2a770bfcb51e4ee10dd326730a5a0b0dc52a684d..e968f641d275d5c6554984667c86c0e0cbcbadc1 100644 (file)
--- 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 7cd11c142688c21f2096dcbe213e5feb94d7e1a6..d619d49d18276fec8971ba999931cf91571d9031 100644 (file)
--- 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 eebf871c1d23206bd8827579e0ecfe7c406fc07a..5bfe1ba81a928d430c102977df1f4d167c55d552 100644 (file)
--- 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 a9b135ca53eb054085fd3130e5f626d0933ce436..b945a20e3b10abc2523b005553c9aace509d7575 100644 (file)
--- 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 cd5a687c44d20c75ce1e1a61897a7b0889f88c43..af428f89ba39d259303e8cbad8d270ec8e3fc181 100644 (file)
--- 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 077f1d976d025202b1ba865859664c90ff3b10eb..7c2e7a8d9e2a4bc6be7cadfa72159f4a822cb7aa 100644 (file)
--- 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 b327b8e585502dafd006405980c29022dd616459..e0d624595b6caf9b307e825453d66b6cbbd08c3c 100644 (file)
--- 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 01e84ac931a82790352074f3749a0d77823a8b80..0a1be67ce0c2c1bf2950ee23cd3b0d7ed2bb595f 100644 (file)
--- 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 004f571bdd02c6436d2d6c3615302e1d8074fe1c..2f595c99dec2b8604a0622948e0d63dc8f4570c9 100644 (file)
--- 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 39952941326a5b6a321e1bbabc8758b4f290b7c8..c770046554f2b32afaca7c43e45d3a4405f1bf0d 100644 (file)
--- 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 b808478bf6c982d029c5736d34091c871c62fc00..047f29b15709703d1f2443c14f60f7c162187251 100644 (file)
--- 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 a99dd7198e32a4a370fee4c12d0488d41c7900e7..3a987df745d505edb52fadee40e39009841e737b 100644 (file)
--- 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 3d564231571abb4e7f7e1b66112829744ec0745b..09ab74c919b65807f226e493453461f7af1c56e9 100644 (file)
--- 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 f0d3fb9e65b682fe2e66caed7e7e1749733490fa..d2c6a53111f4b7218ba0bcca84852d71ed32af79 100644 (file)
--- 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 cade39dbba20cdf26c2f11eae20f41f3c7b05572..3c7f0924dbedff343ebe188a26852d30f51fd09e 100644 (file)
--- 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 682d1060142c7c4d735d51cc3155310fb14a2a64..f6fe71f732761752d48ff527f18b623c6ba5cf84 100644 (file)
--- 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 badde15dcd4006bbe0f3ca2cd3d0bcf43715cae4..8ce8b339a7616468e6b9157b98f3e66860d0e2d8 100644 (file)
--- 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