From 554a13dd4b7b61920c9bd8bdc6df81f040f80871 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 20 Apr 2017 15:47:31 -0700 Subject: [PATCH] CMake: various configure_file fixes to use CMAKE_CURRENT_SOURCE_DIR --- build/cmake/lib/CMakeLists.txt | 8 ++++---- build/cmake/{ => lib}/cmake_uninstall.cmake.in | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename build/cmake/{ => lib}/cmake_uninstall.cmake.in (100%) diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index 937ddbc5..429d4944 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