diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-03-20 21:18:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-03-20 21:18:30 (GMT) |
| commit | da23edd24eba6433baeafec5ef8f4fa1c59a8307 (patch) | |
| tree | fce4d3b29bbe86a3195948953cdbf43f5d4bfcf1 /examples | |
| parent | ba2c98d42aded8887e27f4621afbdb63eb8cedf6 (diff) | |
| download | hdf5-da23edd24eba6433baeafec5ef8f4fa1c59a8307.zip hdf5-da23edd24eba6433baeafec5ef8f4fa1c59a8307.tar.gz hdf5-da23edd24eba6433baeafec5ef8f4fa1c59a8307.tar.bz2 | |
[svn-r24851] example causes modal permission dialog to popup on windows. build but do not execute.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/CMakeTests.cmake | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 38aa241..fe8216d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -44,14 +44,13 @@ foreach (example ${examples}) set_target_properties (${example} PROPERTIES FOLDER examples) endforeach (example ${examples}) -### Windows pops up a modal permission dialog on this test -if (H5_HAVE_PARALLEL AND NOT WIN32) +if (H5_HAVE_PARALLEL) add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c) TARGET_NAMING (ph5example ${LIB_TYPE}) TARGET_C_PROPERTIES (ph5example " " " ") target_link_libraries (ph5example ${HDF5_LIB_TARGET}) set_target_properties (ph5example PROPERTIES FOLDER examples) -endif (H5_HAVE_PARALLEL AND NOT WIN32) +endif (H5_HAVE_PARALLEL) if (BUILD_TESTING) include (CMakeTests.cmake) diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake index 2a20fd8..5a756c8 100644 --- a/examples/CMakeTests.cmake +++ b/examples/CMakeTests.cmake @@ -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) |