diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-01-25 14:40:47 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-01-25 14:40:47 (GMT) |
commit | 8f1d895d17018fd4522a369a5ccec9dae3dbc4bd (patch) | |
tree | c5f9a14f38421e1e9e0ee65acf0578e74d6fc1af /config/cmake/HDF5_Examples.cmake.in | |
parent | 2fe69e7639198b174da393e47a029d0ac35b31c8 (diff) | |
parent | 73fcbbee97c6385fb2b5009e5858ae1d6c28b3c3 (diff) | |
download | hdf5-8f1d895d17018fd4522a369a5ccec9dae3dbc4bd.zip hdf5-8f1d895d17018fd4522a369a5ccec9dae3dbc4bd.tar.gz hdf5-8f1d895d17018fd4522a369a5ccec9dae3dbc4bd.tar.bz2 |
Merge pull request #1496 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '73fcbbee97c6385fb2b5009e5858ae1d6c28b3c3':
CMake fix
Java html fix and cmake update
Update CMake
Diffstat (limited to 'config/cmake/HDF5_Examples.cmake.in')
-rw-r--r-- | config/cmake/HDF5_Examples.cmake.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index d30f2ab..bac174a 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_Examples.cmake.in @@ -48,7 +48,11 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${ ################################################################## if(NOT DEFINED INSTALLDIR) - set(INSTALLDIR "C:/Program Files/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@") + if(WIN32) + set(INSTALLDIR "C:/Program Files/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@") + else() + set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@") + endif() endif() if(NOT DEFINED CTEST_SOURCE_NAME) @@ -70,7 +74,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN #TAR_SOURCE - name of tarfile #if(NOT DEFINED TAR_SOURCE) -# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.10.10-Source") +# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.12.4-Source") #endif() ############################################################################################################### |