summaryrefslogtreecommitdiffstats
path: root/config/cmake_ext_mod/HDFMacros.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-01-09 22:26:12 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-01-09 22:26:12 (GMT)
commit3e0c6530dc3a6008f800b25eb55c1422d853cc67 (patch)
tree45ea417cc70da10bcc85e9cbbf6649b422b0a860 /config/cmake_ext_mod/HDFMacros.cmake
parentbe42e047913c332f148db3b8a9180e6a2eb5c23a (diff)
downloadhdf5-3e0c6530dc3a6008f800b25eb55c1422d853cc67.zip
hdf5-3e0c6530dc3a6008f800b25eb55c1422d853cc67.tar.gz
hdf5-3e0c6530dc3a6008f800b25eb55c1422d853cc67.tar.bz2
HDFFV-10385 fix platform errors
Diffstat (limited to 'config/cmake_ext_mod/HDFMacros.cmake')
-rw-r--r--config/cmake_ext_mod/HDFMacros.cmake21
1 files changed, 4 insertions, 17 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index dd7e262..218c882 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -15,27 +15,14 @@ macro (SET_HDF5_BUILD_TYPE)
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_isMultiConfig)
set(HDF5_BUILD_TYPE ${CMAKE_CFG_INTDIR})
+ set(HDF5_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
else()
if(CMAKE_BUILD_TYPE)
set(HDF5_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+ set(HDF5_CFG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
else()
- set(HDF5_BUILD_TYPE)
- endif()
- endif()
-endmacro ()
-
-#-------------------------------------------------------------------------------
-macro (CREATE_CONFIG_DIR path)
- get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
- if(_isMultiConfig)
- foreach(c ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE})
- file(MAKE_DIRECTORY "${path}/${c}")
- endforeach()
- else()
- if(CMAKE_BUILD_TYPE)
- file(MAKE_DIRECTORY "${path}/${CMAKE_BUILD_TYPE}")
- else()
- file(MAKE_DIRECTORY "${path}")
+ set(HDF5_BUILD_TYPE "Release")
+ set(HDF5_CFG_BUILD_TYPE "Release")
endif()
endif()
endmacro ()