diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-27 19:23:38 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-27 19:23:38 (GMT) |
| commit | 0f94a43c46186eba3a536ab3b60433f469b5672c (patch) | |
| tree | 9461cb643482d83cde2fbc8fb8e278d92e6ca19b | |
| parent | 1c3b0066519352bd8f1d0a8844ab148efe54bcf0 (diff) | |
| download | hdf5-0f94a43c46186eba3a536ab3b60433f469b5672c.zip hdf5-0f94a43c46186eba3a536ab3b60433f469b5672c.tar.gz hdf5-0f94a43c46186eba3a536ab3b60433f469b5672c.tar.bz2 | |
Update with changes from buildbot process
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 672026f..2874a74 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -75,11 +75,16 @@ else() endif()
endif()
+###################################################################
+### Following Line is one of [Release, RelWithDebInfo, Debug] #####
+set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
+###################################################################
+
if(NOT DEFINED INSTALLDIR)
if(WIN32)
- set(INSTALLDIR "C:\\Program\ Files\\myhdf5")
+ set(INSTALLDIR "C:\\Program\ Files\\HDF_Group\\HDF5\\${CTEST_SOURCE_VERSION}")
else()
- set(INSTALLDIR "/usr/local/myhdf5")
+ set(INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
endif()
endif()
if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
@@ -227,7 +232,8 @@ endif() set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
### change install prefix
-set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
+set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH='${INSTALLDIR}'")
+set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")
###################################################################
|