diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-02 23:10:57 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-02 23:10:57 (GMT) |
| commit | 690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14 (patch) | |
| tree | d5bea357e6e1f96f52bc09d9ad314d8c24f44223 /config | |
| parent | b53d5c485c94db8083bc36e5bf6cca3aa017a103 (diff) | |
| download | hdf5-690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14.zip hdf5-690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14.tar.gz hdf5-690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14.tar.bz2 | |
[svn-r26344] Bring revisions #25870 - #25902 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 14 | ||||
| -rw-r--r-- | config/lt_vers.am | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 5ebb9cd..78c8d9b 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -12,7 +12,7 @@ set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG}) set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY}) set(CTEST_BUILD_CONFIGURATION "Release") #set(NO_MAC_FORTRAN "true") -#set(BUILD_OPTIONS ""${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON") +#set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON") #set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_ENABLE_F2003:BOOL=ON) set(CTEST_USE_TAR_SOURCE "true") @@ -68,9 +68,8 @@ if(CTEST_USE_TAR_SOURCE) ## Uncompress source if tar or zip file provided ## -------------------------- if(WIN32) - set(CTEST_7Z_COMMAND "C:/Program Files/7-Zip/7z.exe") - message(STATUS "extracting... [${CTEST_7Z_COMMAND} x ${CTEST_SOURCE_NAME}.zip]") - execute_process(COMMAND ${CTEST_7Z_COMMAND} x ${CTEST_SOURCE_NAME}.zip RESULT_VARIABLE rv) + message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip]") + execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv) else(WIN32) message(STATUS "extracting... [${CTEST_CMAKE_COMMAND} -E tar -xvf ${CTEST_SOURCE_NAME}.tar.gz]") execute_process(COMMAND tar -xvf ${CTEST_SOURCE_NAME}.tar.gz RESULT_VARIABLE rv) @@ -87,8 +86,11 @@ endif(CTEST_USE_TAR_SOURCE) ## Clear the build directory ## -------------------------- set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE) -file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}") -ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) +if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}") + ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) +else (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}") + file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}") +endif (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}") # Use multiple CPU cores to build include(ProcessorCount) diff --git a/config/lt_vers.am b/config/lt_vers.am index 705d5f5..d86ce38 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 = 196 +LT_VERS_REVISION = 197 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and |