summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-01-28 18:49:00 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-01-28 18:49:00 (GMT)
commit277f57d3714d703708ce15bf220cc37e942c2e4c (patch)
tree18fadfdc2a5496582c8ce55481ea23144748ecf9 /config
parentcee36ca40d91ced2a417156feac3fd7407f0b82d (diff)
parent9149d5a5352de4e0b9a2e57c91525a6cad767760 (diff)
downloadhdf5-277f57d3714d703708ce15bf220cc37e942c2e4c.zip
hdf5-277f57d3714d703708ce15bf220cc37e942c2e4c.tar.gz
hdf5-277f57d3714d703708ce15bf220cc37e942c2e4c.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '9149d5a5352de4e0b9a2e57c91525a6cad767760': Revert build name setting
Diffstat (limited to 'config')
-rw-r--r--config/cmake_ext_mod/HDFMacros.cmake2
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()