From: Michael Maltese Date: Thu, 20 Apr 2017 22:47:31 +0000 (-0700) Subject: CMake: various configure_file fixes to use CMAKE_CURRENT_SOURCE_DIR X-Git-Tag: v1.2.0^2~32^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=554a13dd4b7b61920c9bd8bdc6df81f040f80871;p=thirdparty%2Fzstd.git CMake: various configure_file fixes to use CMAKE_CURRENT_SOURCE_DIR --- diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index 937ddbc50..429d49449 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -138,7 +138,7 @@ IF (UNIX) ADD_CUSTOM_TARGET(libzstd.pc ALL ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" - -P "${CMAKE_SOURCE_DIR}/lib/pkgconfig.cmake" + -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" COMMENT "Creating pkg-config file") # install target @@ -151,10 +151,10 @@ IF (UNIX) # uninstall target CONFIGURE_FILE( - "${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) ADD_CUSTOM_TARGET(uninstall - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake) + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) ENDIF (UNIX) diff --git a/build/cmake/cmake_uninstall.cmake.in b/build/cmake/lib/cmake_uninstall.cmake.in similarity index 100% rename from build/cmake/cmake_uninstall.cmake.in rename to build/cmake/lib/cmake_uninstall.cmake.in