diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-12-17 21:24:51 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-12-17 21:24:51 (GMT) |
| commit | 4c24346fe1c5ff4ff9e4a9ae7ffec2b5ef9cd922 (patch) | |
| tree | 8b0a4c2f9800ac804a53b5ce3104b420cd59821d | |
| parent | 3eaa80b0d34aa5711df49b31f15bf214e7c18785 (diff) | |
| download | hdf5-4c24346fe1c5ff4ff9e4a9ae7ffec2b5ef9cd922.zip hdf5-4c24346fe1c5ff4ff9e4a9ae7ffec2b5ef9cd922.tar.gz hdf5-4c24346fe1c5ff4ff9e4a9ae7ffec2b5ef9cd922.tar.bz2 | |
[svn-r25898] Replace 7zip required command with cmake command
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 2b3c2fd..78c8d9b 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -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) |