philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r27933] Cmake 3.3 allowed execute_process to merge output and error files if the filename or the variable were the same.

Browse Source 
Changed instances to make the outpu_variable different.
This commit is contained in:
Allen Byrne
2015-10-02 12:55:08 -05:00
parent b9d27c0ed3
commit af5c2697a1
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/cmake/userblockTest.cmake
View File

@@ -48,7 +48,7 @@ if (TEST_CHECKUB STREQUAL "YES")
WORKING_DIRECTORY ${TEST_FOLDER}
RESULT_VARIABLE TEST_RESULT
OUTPUT_FILE ${TEST_HFILE}.len.txt
OUTPUT_VARIABLE TEST_ERROR
OUTPUT_VARIABLE TEST_OUT
ERROR_VARIABLE TEST_ERROR
)
if (NOT ${TEST_RESULT} STREQUAL "0")
@@ -66,7 +66,7 @@ if (TEST_CHECKUB STREQUAL "YES")
WORKING_DIRECTORY ${TEST_FOLDER}
RESULT_VARIABLE TEST_RESULT
OUTPUT_FILE ${TEST_HFILE}-ub.cmp
OUTPUT_VARIABLE TEST_ERROR
OUTPUT_VARIABLE TEST_OUT
ERROR_VARIABLE TEST_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
@@ -84,7 +84,7 @@ if (TEST_CHECKUB STREQUAL "YES")
WORKING_DIRECTORY ${TEST_FOLDER}
RESULT_VARIABLE TEST_RESULT
OUTPUT_FILE ${TEST_HFILE}.cmp
OUTPUT_VARIABLE TEST_ERROR
OUTPUT_VARIABLE TEST_OUT
ERROR_VARIABLE TEST_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
@@ -107,7 +107,7 @@ else (TEST_CHECKUB STREQUAL "YES")
COMMAND ${TEST_PROGRAM} ${TEST_HFILE}
WORKING_DIRECTORY ${TEST_FOLDER}
RESULT_VARIABLE TEST_H_STRING_LEN
OUTPUT_VARIABLE TEST_ERROR
OUTPUT_VARIABLE TEST_OUT
ERROR_VARIABLE TEST_ERROR
)
if (NOT TEST_H_STRING_LEN STREQUAL "0")