From 73260a097b019965a784a0cc3746c5bb66cb06d9 Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Sun, 20 Sep 2020 12:54:20 -0700 Subject: [PATCH] Fixed cmake script directory for out of source builds. --- cmake/run-and-compare.cmake | 4 ++-- cmake/test-compress.cmake | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/run-and-compare.cmake b/cmake/run-and-compare.cmake index 8a4c750d..62657992 100644 --- a/cmake/run-and-compare.cmake +++ b/cmake/run-and-compare.cmake @@ -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() diff --git a/cmake/test-compress.cmake b/cmake/test-compress.cmake index 03878d86..75355bc7 100644 --- a/cmake/test-compress.cmake +++ b/cmake/test-compress.cmake @@ -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) -- 2.47.3