diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-03-20 15:40:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-03-20 15:40:30 (GMT) |
| commit | 851a0dcfaf1aa895824059af13efc590ddafa564 (patch) | |
| tree | 8cdbc838e62bd94855741f1cffc9e834cf6f45a8 | |
| parent | 9fb399b3d2c071f273279be81317be53a084d073 (diff) | |
| download | hdf5-851a0dcfaf1aa895824059af13efc590ddafa564.zip hdf5-851a0dcfaf1aa895824059af13efc590ddafa564.tar.gz hdf5-851a0dcfaf1aa895824059af13efc590ddafa564.tar.bz2 | |
[svn-r26497] minor corrections noticed in 1.8 should be in trunk as well
| -rw-r--r-- | CMakeFilters.cmake | 4 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 | ||||
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 4 | ||||
| -rw-r--r-- | config/cmake/README.txt.cmake.in | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index bd39dd3..3a2bec4 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -19,8 +19,8 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 1) option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1) if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") - set (ZLIB_URL ${ZLIB_SVN_URL}) - set (SZIP_URL ${SZIP_SVN_URL}) + set (ZLIB_URL ${ZLIB_SVN_URL} CACHE STRING "Path to zlib Subversion repository") + set (SZIP_URL ${SZIP_SVN_URL} CACHE STRING "Path to szip Subversion repository") elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") if (NOT TGZPATH) set (TGZPATH ${HDF5_SOURCE_DIR}) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index c13b420..d59032f 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -218,9 +218,6 @@ /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ #cmakedefine H5_HAVE_LIBDMALLOC @H5_HAVE_LIBDMALLOC@ -/* Define to 1 if you have the `lmpe' library (-llmpe). */ -#cmakedefine H5_HAVE_LIBLMPE @H5_HAVE_LIBLMPE@ - /* Define to 1 if you have the `m' library (-lm). */ #cmakedefine H5_HAVE_LIBM @H5_HAVE_LIBM@ diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index efd7c04..c6d0b39 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -71,8 +71,8 @@ if(CTEST_USE_TAR_SOURCE) 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) + message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar]") + execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv) endif(WIN32) if(NOT rv EQUAL 0) diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in index b88fedf..cc8baeb 100644 --- a/config/cmake/README.txt.cmake.in +++ b/config/cmake/README.txt.cmake.in @@ -32,7 +32,7 @@ utility should be installed. To test the installation with the examples; Create a directory to run the examples. - Copy HDF5Examples-0.1.1-Source folder to this directory, do NOT unzip. + Copy HDF5Examples folder to this directory. Copy HDF518_Examples.cmake to this directory. Edit HDF518_Examples.cmake line 8 to set INSTALLDIR to where HDF5 is installed. (The default should be correct unless you installed into a different folder.) |