diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-10-02 17:55:08 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-10-02 17:55:08 (GMT) |
| commit | af5c2697a170108421fc2b0e5dfd7cc7daa082ee (patch) | |
| tree | 4ef58434bc4836334539f990cd98b0b31e95bad4 /config/cmake/userblockTest.cmake | |
| parent | b9d27c0ed3c20d70e1bb197fb37853508eea216c (diff) | |
| download | hdf5-af5c2697a170108421fc2b0e5dfd7cc7daa082ee.zip hdf5-af5c2697a170108421fc2b0e5dfd7cc7daa082ee.tar.gz hdf5-af5c2697a170108421fc2b0e5dfd7cc7daa082ee.tar.bz2 | |
[svn-r27933] Cmake 3.3 allowed execute_process to merge output and error files if the filename or the variable were the same.
Changed instances to make the outpu_variable different.
Diffstat (limited to 'config/cmake/userblockTest.cmake')
| -rw-r--r-- | config/cmake/userblockTest.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake index fab470c..0775cbe 100644 --- a/config/cmake/userblockTest.cmake +++ b/config/cmake/userblockTest.cmake @@ -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") |