]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Remove COMMAND_ECHO statements only available in CMake 3.15. #1511
authorNathan Moinvaziri <nathan@nathanm.com>
Sun, 4 Jun 2023 19:39:42 +0000 (12:39 -0700)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Mon, 5 Jun 2023 12:34:47 +0000 (14:34 +0200)
Instead use -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=ON.

test/cmake/compress-and-verify.cmake

index fa69773906f197ae74caf49ea1f70cffbfa4aee7..d2d9917a93fe9e99004acb6d18c191d8c4282fa0 100644 (file)
@@ -119,15 +119,13 @@ macro(exec_streams tcmd tsrc tdst)
         -DOUTPUT=${tdst}
         "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
         -P ${CMAKE_CURRENT_LIST_DIR}/run-and-redirect.cmake
-        RESULT_VARIABLE CMD_RESULT
-        COMMAND_ECHO STDOUT)
+        RESULT_VARIABLE CMD_RESULT)
 endmacro()
 
 macro(exec_files tcmd tsrc)
     execute_process(COMMAND
         ${tcmd} ${tsrc}
-        RESULT_VARIABLE CMD_RESULT
-        COMMAND_ECHO STDOUT)
+        RESULT_VARIABLE CMD_RESULT)
 endmacro()
 
 # Compress input file
@@ -189,8 +187,7 @@ if(COMPARE)
     # Compare decompressed output with original input file
     execute_process(COMMAND ${CMAKE_COMMAND}
         -E compare_files ${INPUT} ${OUTPUT_BASE}
-        RESULT_VARIABLE CMD_RESULT
-        COMMAND_ECHO STDOUT)
+        RESULT_VARIABLE CMD_RESULT)
 
     if(CMD_RESULT)
         diff(${INPUT} ${OUTPUT_BASE})