Skip to content
Snippets Groups Projects
Verified Commit 35b254f7 authored by Lars Bilke's avatar Lars Bilke
Browse files

[cmake] Restore 3.16 compatibility.

parent 98aeeb37
No related branches found
No related tags found
No related merge requests found
set(_exec_process_args "")
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.18)
set(_exec_process_args ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE)
endif()
# Run vtk.js converter # Run vtk.js converter
if(VIS_FILES AND VTKJS_CONVERTER) if(VIS_FILES AND VTKJS_CONVERTER)
execute_process(COMMAND cmake -E make_directory ${VTKJS_OUTPUT_PATH}) execute_process(COMMAND cmake -E make_directory ${VTKJS_OUTPUT_PATH})
...@@ -55,13 +60,13 @@ foreach(cmd ${TESTER_COMMAND}) ...@@ -55,13 +60,13 @@ foreach(cmd ${TESTER_COMMAND})
WORKING_DIRECTORY ${SOURCE_PATH} WORKING_DIRECTORY ${SOURCE_PATH}
RESULT_VARIABLE EXIT_CODE RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT OUTPUT_VARIABLE OUTPUT
ERROR_VARIABLE OUTPUT ERROR_VARIABLE OUTPUT ${_exec_process_args}
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE
) )
if(NOT EXIT_CODE STREQUAL "0") if(NOT EXIT_CODE STREQUAL "0")
file(WRITE ${LOG_FILE} ${OUTPUT}) file(WRITE ${LOG_FILE} ${OUTPUT})
message(WARNING "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}") message(
WARNING "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}"
)
set(TEST_FAILED TRUE) set(TEST_FAILED TRUE)
endif() endif()
endforeach() endforeach()
...@@ -73,9 +78,7 @@ foreach(cmd ${TESTER_COMMAND}) ...@@ -73,9 +78,7 @@ foreach(cmd ${TESTER_COMMAND})
WORKING_DIRECTORY ${SOURCE_PATH} WORKING_DIRECTORY ${SOURCE_PATH}
RESULT_VARIABLE EXIT_CODE RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT OUTPUT_VARIABLE OUTPUT
ERROR_VARIABLE OUTPUT ERROR_VARIABLE OUTPUT ${_exec_process_args}
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE
) )
if(NOT EXIT_CODE STREQUAL "0") if(NOT EXIT_CODE STREQUAL "0")
file(WRITE ${LOG_FILE} ${OUTPUT}) file(WRITE ${LOG_FILE} ${OUTPUT})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment