]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
CMake: various configure_file fixes to use CMAKE_CURRENT_SOURCE_DIR
authorMichael Maltese <michaeljosephmaltese@gmail.com>
Thu, 20 Apr 2017 22:47:31 +0000 (15:47 -0700)
committerMichael Maltese <michaeljosephmaltese@gmail.com>
Fri, 21 Apr 2017 02:30:38 +0000 (19:30 -0700)
build/cmake/lib/CMakeLists.txt
build/cmake/lib/cmake_uninstall.cmake.in [moved from build/cmake/cmake_uninstall.cmake.in with 100% similarity]

index 937ddbc507033f2a9adb8e0cc6bd99214d7ac690..429d49449c8c5e4ff7565c292918787f13254794 100644 (file)
@@ -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)