diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-08-23 13:46:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-08-23 13:46:34 (GMT) |
| commit | 731ebbb93ffd15a1e9ce94e3288491247abfc60c (patch) | |
| tree | 6db7f9c7cb161523f68e6a258fc4a934055f4b3c /config | |
| parent | ed16ca44b5d281369e0f8a7890099896605ff64d (diff) | |
| download | hdf5-731ebbb93ffd15a1e9ce94e3288491247abfc60c.zip hdf5-731ebbb93ffd15a1e9ce94e3288491247abfc60c.tar.gz hdf5-731ebbb93ffd15a1e9ce94e3288491247abfc60c.tar.bz2 | |
Merge CMake and Java OSX changes from develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDF5_Examples.cmake.in | 2 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index eb57685..bbe632c 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_Examples.cmake.in @@ -48,7 +48,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${ ################################################################## if(NOT DEFINED INSTALLDIR) - set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@") + set(INSTALLDIR "C:/Program Files/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@") endif() if(NOT DEFINED CTEST_SOURCE_NAME) diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index c12b2e6..4cb303f 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -184,7 +184,7 @@ set (MODEL "Experimental") ##### Following controls source update #####
#set (LOCAL_UPDATE "TRUE")
set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
-set (REPOSITORY_BRANCH "hdf5_1_10_3")
+set (REPOSITORY_BRANCH "hdf5_1_10_4")
#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
|