diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-01-28 14:24:16 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-01-28 14:24:16 (GMT) |
| commit | 9149d5a5352de4e0b9a2e57c91525a6cad767760 (patch) | |
| tree | b25741432a201a79efcc72ac3bc6c02c84e3926c | |
| parent | 7447f636a4984d6bc630b7565f618ba1583b6f41 (diff) | |
| parent | f26ee27b1fd85d192b37d9e45fb6d20f1b7e23db (diff) | |
| download | hdf5-9149d5a5352de4e0b9a2e57c91525a6cad767760.zip hdf5-9149d5a5352de4e0b9a2e57c91525a6cad767760.tar.gz hdf5-9149d5a5352de4e0b9a2e57c91525a6cad767760.tar.bz2 | |
Merge pull request #1504 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f26ee27b1fd85d192b37d9e45fb6d20f1b7e23db':
Revert build name setting
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index b3d97ce..2f4ce52 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -14,7 +14,7 @@ macro (SET_HDF_BUILD_TYPE) get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(_isMultiConfig) - set(HDF_CFG_NAME \${CTEST_CONFIGURATION_TYPE}) + set(HDF_CFG_NAME ${CMAKE_BUILD_TYPE}) set(HDF_BUILD_TYPE ${CMAKE_CFG_INTDIR}) set(HDF_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME}) else() |