]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Fixed cmake script directory for out of source builds.
authorNathan Moinvaziri <nathan@nathanm.com>
Sun, 20 Sep 2020 19:54:20 +0000 (12:54 -0700)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Wed, 23 Sep 2020 20:34:55 +0000 (22:34 +0200)
cmake/run-and-compare.cmake
cmake/test-compress.cmake

index 8a4c750d1578c764711fa6e0087440a4655d797e..62657992574f3f7487c7623337d46770e6476ad1 100644 (file)
@@ -9,7 +9,7 @@ if(INPUT)
         -DINPUT=${INPUT}
         -DOUTPUT=${OUTPUT}
         "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+        -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
         RESULT_VARIABLE CMD_RESULT)
 else()
     # Run command and redirect stdout to output
@@ -17,7 +17,7 @@ else()
         "-DCOMMAND=${COMMAND}"
         -DOUTPUT=${OUTPUT}
         "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+        -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
         RESULT_VARIABLE CMD_RESULT)
 endif()
 
index 03878d8691a3a232913980f63262b2834408742c..75355bc73776fae1eea6e25e8c1d45df904ecd6f 100644 (file)
@@ -55,7 +55,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
     -DINPUT=${INPUT}
     -DOUTPUT=${OUTPUT}.gz
     "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+    -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
     RESULT_VARIABLE CMD_RESULT)
 
 if(CMD_RESULT)
@@ -76,7 +76,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
     -DINPUT=${OUTPUT}.gz
     -DOUTPUT=${OUTPUT}.out
     "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+    -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
     RESULT_VARIABLE CMD_RESULT)
 
 if(CMD_RESULT)
@@ -113,7 +113,7 @@ if(GZIP_VERIFY AND NOT "${COMPRESS_ARGS}" MATCHES "-T")
             -DINPUT=${OUTPUT}.gz
             -DOUTPUT=${OUTPUT}.gzip.out
             "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+            -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
             RESULT_VARIABLE CMD_RESULT)
 
         if(CMD_RESULT)
@@ -144,7 +144,7 @@ if(GZIP_VERIFY AND NOT "${COMPRESS_ARGS}" MATCHES "-T")
             -DINPUT=${INPUT}
             -DOUTPUT=${OUTPUT}.gzip.gz
             "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+            -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
             RESULT_VARIABLE CMD_RESULT)
 
         if(CMD_RESULT)
@@ -163,7 +163,7 @@ if(GZIP_VERIFY AND NOT "${COMPRESS_ARGS}" MATCHES "-T")
             -DINPUT=${OUTPUT}.gzip.gz
             -DOUTPUT=${OUTPUT}.gzip.out
             "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-            -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+            -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
             RESULT_VARIABLE CMD_RESULT)
 
         if(CMD_RESULT)