From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 4 Jun 2023 19:39:42 +0000 (-0700)
Subject: Remove COMMAND_ECHO statements only available in CMake 3.15. #1511
X-Git-Tag: 2.1.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69bd70a4c1dab90053dacb98e4dac9892d789da0;p=thirdparty%2Fzlib-ng.git

Remove COMMAND_ECHO statements only available in CMake 3.15. #1511

Instead use -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=ON.
---

diff --git a/test/cmake/compress-and-verify.cmake b/test/cmake/compress-and-verify.cmake
index fa6977390..d2d9917a9 100644
--- a/test/cmake/compress-and-verify.cmake
+++ b/test/cmake/compress-and-verify.cmake
@@ -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})