From: Bob Apthorpe Date: Mon, 13 Jul 2020 22:41:13 +0000 (+0000) Subject: CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR X-Git-Tag: 2.46.0~20^2^2~179^2~2^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5167d7cf73cf188cda1930ccb1e596701a5908c5;p=graphviz CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 622901629..1a8e33045 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ if (with_smyrna) endif (with_smyrna) # ===================== Append local CMake module directory ==================== -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # ============================= Build dependencies ============================= find_package(AWK REQUIRED) @@ -55,7 +55,7 @@ set(MAN_INSTALL_DIR share/man/man3) set(PKGCONFIG_DIR lib/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_SOURCE_DIR}") +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") @@ -252,14 +252,14 @@ set(exec_prefix "${CMAKE_INSTALL_PREFIX}") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") set(includedir "${CMAKE_INSTALL_PREFIX}/include") set(PACKAGE "graphviz") -configure_file(${CMAKE_SOURCE_DIR}/lib/cdt/libcdt.pc.in ${CMAKE_SOURCE_DIR}/libcdt.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/lib/cgraph/libcgraph.pc.in ${CMAKE_SOURCE_DIR}/libcgraph.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/lib/gvc/libgvc.pc.in ${CMAKE_SOURCE_DIR}/libgvc.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/lib/gvpr/libgvpr.pc.in ${CMAKE_SOURCE_DIR}/libgvpr.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/lib/edgepaint/liblab_gamut.pc.in ${CMAKE_SOURCE_DIR}/liblab_gamut.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/lib/pathplan/libpathplan.pc.in ${CMAKE_SOURCE_DIR}/libpathplan.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/lib/xdot/libxdot.pc.in ${CMAKE_SOURCE_DIR}/libxdot.pc @ONLY) -file(GLOB pcfiles "${CMAKE_SOURCE_DIR}/*.pc") +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/cdt/libcdt.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libcdt.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/cgraph/libcgraph.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libcgraph.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/gvc/libgvc.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libgvc.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/gvpr/libgvpr.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libgvpr.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/edgepaint/liblab_gamut.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/liblab_gamut.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/pathplan/libpathplan.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libpathplan.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/xdot/libxdot.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libxdot.pc @ONLY) +file(GLOB pcfiles "${CMAKE_CURRENT_SOURCE_DIR}/*.pc") foreach(file "${pcfiles}") install(FILES ${file} DESTINATION "${PKGCONFIG_DIR}") endforeach(file)