CMake: remove 'TOP_SOURCE_DIR'

This can be located through standard CMake mechanisms.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca363b3aca39ba9e552783389dada52ff6ed829..90e5e9a028eced9502969e816d209f11f6ab7d92 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,6 @@ set(PLUGIN_INSTALL_DIR      ${LIBRARY_INSTALL_DIR}/graphviz)
 set(PKGCONFIG_DIR           ${LIBRARY_INSTALL_DIR}/pkgconfig)
 # TODO: Find a way to check for groff and ps2pdf for manpage pdf generation
 # 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(WINDOWS_DEPENDENCY_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries")
 set(WINDOWS_DEPENDENCY_VCPKG_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries/vcpkg/installed")

diff --git a/cmake/package_info.cmake b/cmake/package_info.cmake
index d5474cc8d83d6e47bea4458110b397ab6a155263..b195234d34554d4701d80e85474c5d935cf16f7b 100644 (file)
--- a/cmake/package_info.cmake
+++ b/cmake/package_info.cmake
@@ -6,8 +6,8 @@ set(CPACK_PACKAGE_VERSION_PATCH         ${GRAPHVIZ_VERSION_PATCH}       )
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY   "Graph Visualization Tools"     )
 set(CPACK_PACKAGE_VENDOR                Graphviz                        )
 set(CPACK_PACKAGE_CONTACT               http://www.graphviz.org/        )
-set(CPACK_RESOURCE_FILE_LICENSE         "${TOP_SOURCE_DIR}/LICENSE"     )
-set(CPACK_RESOURCE_FILE_README          "${TOP_SOURCE_DIR}/README.md"   )
+set(CPACK_RESOURCE_FILE_LICENSE         "${CMAKE_SOURCE_DIR}/LICENSE"   )
+set(CPACK_RESOURCE_FILE_README          "${CMAKE_SOURCE_DIR}/README.md" )
 
 set(CPACK_GENERATOR ZIP)
 
@@ -29,8 +29,8 @@ endif()
 
 find_package(NSIS)
 if(NSIS_FOUND)
-  set(CPACK_NSIS_MUI_ICON "${TOP_SOURCE_DIR}/windows/build/Graphviz.ico")
-  set(CPACK_NSIS_MUI_UNIICON "${TOP_SOURCE_DIR}/windows/build/Graphviz.ico")
+  set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/windows/build/Graphviz.ico")
+  set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/windows/build/Graphviz.ico")
   set(CPACK_NSIS_INSTALLED_ICON_NAME "Uninstall.exe")
   set(CPACK_NSIS_HELP_LINK "http://www.graphviz.org")
   set(CPACK_NSIS_URL_INFO_ABOUT "http://www.graphviz.org")

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 493e60c63f7e728e63d86d3b15dceb9645b73a7c..66b6435d1d86b517a73911e500dcf185d1d99715 100644 (file)
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -11,8 +11,9 @@ endif()
 add_custom_command(
   OUTPUT svgcolor_lib
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svgcolor_names
-          ${TOP_SOURCE_DIR}/awk/svgcolor.awk
-  COMMAND ${AWK_EXECUTABLE} ${AWK_OPTIONS} -f ${TOP_SOURCE_DIR}/awk/svgcolor.awk
+          ${CMAKE_SOURCE_DIR}/awk/svgcolor.awk
+  COMMAND ${AWK_EXECUTABLE} ${AWK_OPTIONS} -f
+          ${CMAKE_SOURCE_DIR}/awk/svgcolor.awk
           ${CMAKE_CURRENT_SOURCE_DIR}/svgcolor_names
           >${CMAKE_CURRENT_BINARY_DIR}/svgcolor_lib
   COMMENT "generate SVG color library"
@@ -20,14 +21,14 @@ add_custom_command(
 add_custom_command(
   OUTPUT brewer_lib
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/brewer_colors
-          ${TOP_SOURCE_DIR}/awk/brewer.awk
-  COMMAND ${AWK_EXECUTABLE} -f ${TOP_SOURCE_DIR}/awk/brewer.awk
+          ${CMAKE_SOURCE_DIR}/awk/brewer.awk
+  COMMAND ${AWK_EXECUTABLE} -f ${CMAKE_SOURCE_DIR}/awk/brewer.awk
           ${CMAKE_CURRENT_SOURCE_DIR}/brewer_colors
           >${CMAKE_CURRENT_BINARY_DIR}/brewer_lib
   COMMENT "generate Brewer color library"
 )
 configure_file(
-  "${TOP_SOURCE_DIR}/cmake/generate_color_lib.cmake.in"
+  "${CMAKE_SOURCE_DIR}/cmake/generate_color_lib.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/generate_color_lib.cmake"
   @ONLY
 )
@@ -45,7 +46,7 @@ add_custom_command(
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/color_lib
   COMMAND ${CMAKE_COMMAND} -E make_directory
           "${CMAKE_CURRENT_BINARY_DIR}/common"
-  COMMAND ${AWK_EXECUTABLE} -f ${TOP_SOURCE_DIR}/awk/colortbl.awk
+  COMMAND ${AWK_EXECUTABLE} -f ${CMAKE_SOURCE_DIR}/awk/colortbl.awk
           ${CMAKE_CURRENT_BINARY_DIR}/color_lib
           >${CMAKE_CURRENT_BINARY_DIR}/common/colortbl.h
   COMMENT "generate color table"

diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index f15355274b09561350813542906647dbdf58e99b..b1796d47232e3e93acb7496e46faa86368a892c2 100644 (file)
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -43,7 +43,7 @@ target_include_directories(gvc
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../pathplan>
     $<INSTALL_INTERFACE:include/graphviz>
   PRIVATE
-    ${TOP_SOURCE_DIR}
+    ../..
 )
 
 target_link_libraries(gvc PRIVATE