From 7b05bc611fe5d83aad7ded0e3186cde683a1a7b8 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 5 Nov 2013 16:42:19 +0000 Subject: [PATCH] Quickfix: Do not use the "sed" statement in run_testsuite at all on non GNU platforms git-svn-id: https://svn.dealii.org/trunk@31550 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/scripts/run_testsuite.cmake | 30 +++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/deal.II/cmake/scripts/run_testsuite.cmake b/deal.II/cmake/scripts/run_testsuite.cmake index f8b2d09d41..cc6070429b 100644 --- a/deal.II/cmake/scripts/run_testsuite.cmake +++ b/deal.II/cmake/scripts/run_testsuite.cmake @@ -563,17 +563,27 @@ Unable to determine test submission files from TAG. Bailing out. " ) ENDIF() -FILE(GLOB _xml_files ${_path}/*.xml) -EXECUTE_PROCESS(COMMAND sed -i -e - s/CompilerName=\"\"/CompilerName=\"${_compiler_name}\"\\n\\tCompilerVersion=\"${_compiler_version}\"/g - ${_xml_files} - OUTPUT_QUIET RESULT_VARIABLE _res - ) -IF(NOT "${_res}" STREQUAL "0") - MESSAGE(FATAL_ERROR " -\"sed\" failed. Bailing out. -" + +IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + # + # Only use the following sed command on GNU userlands: + # + # TODO: Come up with a more robust way to inject this that also works on + # BSD and Mac + # + MESSAGE(FATAL_ERROR "Success") + FILE(GLOB _xml_files ${_path}/*.xml) + EXECUTE_PROCESS(COMMAND sed -i -e + s/CompilerName=\"\"/CompilerName=\"${_compiler_name}\"\\n\\tCompilerVersion=\"${_compiler_version}\"/g + ${_xml_files} + OUTPUT_QUIET RESULT_VARIABLE _res ) + IF(NOT "${_res}" STREQUAL "0") + MESSAGE(FATAL_ERROR " + \"sed\" failed. Bailing out. + " + ) + ENDIF() ENDIF() IF(NOT "${_svn_WC_REVISION}" STREQUAL "") -- 2.39.5