diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-04-21 14:58:43 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-04-21 14:58:43 (GMT) |
| commit | 65b3bc2a937337239ceede5e39261c6b2ba4dc69 (patch) | |
| tree | c6139980f34978fefe3fad3c756d4916f4d7d389 /config | |
| parent | 3f36df51d845a93e94fff264fa22ad60a71db754 (diff) | |
| download | hdf5-65b3bc2a937337239ceede5e39261c6b2ba4dc69.zip hdf5-65b3bc2a937337239ceede5e39261c6b2ba4dc69.tar.gz hdf5-65b3bc2a937337239ceede5e39261c6b2ba4dc69.tar.bz2 | |
[svn-r26861] Bring revisions #26401 - #26459 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 21 | ||||
| -rw-r--r-- | config/lt_vers.am | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 7b7cf0a..efd7c04 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -110,16 +110,17 @@ set (CTEST_CONFIGURE_COMMAND set($ENV{LC_MESSAGES} "en_EN") #----------------------------------------------------------------------------- - ## NORMAL process - ## -------------------------- - CTEST_START (Experimental) - CTEST_CONFIGURE (BUILD "${CTEST_BINARY_DIRECTORY}") - CTEST_READ_CUSTOM_FILES ("${CTEST_BINARY_DIRECTORY}") - CTEST_BUILD (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND) - CTEST_TEST (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res) - if(res GREATER 0) - message (FATAL_ERROR "tests FAILED") - endif(res GREATER 0) +configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake) +ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}") +## NORMAL process +## -------------------------- +ctest_start (Experimental) +ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}") +ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND) +ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res) +if(res GREATER 0) + message (FATAL_ERROR "tests FAILED") +endif(res GREATER 0) #----------------------------------------------------------------------------- ############################################################################################################## message(STATUS "DONE")
\ No newline at end of file diff --git a/config/lt_vers.am b/config/lt_vers.am index d442ca9..41d7e81 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -19,7 +19,7 @@ # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 205 +LT_VERS_REVISION = 206 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and |