diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-17 22:26:28 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-17 22:26:28 (GMT) |
| commit | 99ceb100fe1d24ccd7a01b8b3139aa5efadab4b1 (patch) | |
| tree | 66effb31440590b0a2144c6466ca45dad7842aae /examples | |
| parent | 611d2c89afa02204e6321849d24aed26878097f0 (diff) | |
| download | hdf5-99ceb100fe1d24ccd7a01b8b3139aa5efadab4b1.zip hdf5-99ceb100fe1d24ccd7a01b8b3139aa5efadab4b1.tar.gz hdf5-99ceb100fe1d24ccd7a01b8b3139aa5efadab4b1.tar.bz2 | |
[svn-r25309] Bring revisions #24783 - #24851 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/CMakeTests.cmake | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 088a238..fe8216d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.10) +cmake_minimum_required (VERSION 2.8.11) PROJECT (HDF5_EXAMPLES) #----------------------------------------------------------------------------- diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake index 9f51d74..5a756c8 100644 --- a/examples/CMakeTests.cmake +++ b/examples/CMakeTests.cmake @@ -4,7 +4,7 @@ ### T E S T I N G ### ############################################################################## ############################################################################## - FILE (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w) + file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w) # Remove any output file left over from previous test run add_test ( @@ -56,10 +56,11 @@ set (last_test "EXAMPLES-${example}") endforeach (example ${examples}) - if (H5_HAVE_PARALLEL) +### Windows pops up a modal permission dialog on this test + if (H5_HAVE_PARALLEL AND NOT WIN32) add_test (NAME EXAMPLES-ph5example COMMAND $<TARGET_FILE:ph5example>) if (NOT "${last_test}" STREQUAL "") set_tests_properties (EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test}) endif (NOT "${last_test}" STREQUAL "") set (last_test "EXAMPLES-ph5example") - endif (H5_HAVE_PARALLEL) + endif (H5_HAVE_PARALLEL AND NOT WIN32) |