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

[svn-r27953] Merge of CMake files from the trunk.

Browse Source 
r27796, 27803, 27808, 27817, 27823, 27831, 27836, 27846, 27858-27874,
27894-27897, 27901, 27903-27933

Not tested. CMake still basically broken in this branch.
This commit is contained in:
Dana Robinson
2015-10-05 02:17:21 -05:00
parent 376f8390b6
commit 14d1cc2a4f
20 changed files with 634 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/cmake/vfdTest.cmake
View File

@@ -29,7 +29,7 @@ EXECUTE_PROCESS (
WORKING_DIRECTORY ${TEST_FOLDER}
OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out
ERROR_FILE ${TEST_OUTPUT}_${TEST_VFD}.err
OUTPUT_VARIABLE TEST_ERROR
OUTPUT_VARIABLE TEST_OUT
ERROR_VARIABLE TEST_ERROR
)
@@ -37,7 +37,7 @@ message (STATUS "COMMAND Result: ${TEST_RESULT}")
if (ERROR_APPEND)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM)
file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}")
file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}")
endif (ERROR_APPEND)
# if the return value is !=${TEST_EXPECT} bail out