philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-10385 correct platform issues

Browse Source
This commit is contained in:
Allen Byrne
2018-01-09 16:38:54 -06:00
parent 969fe0373e
commit fa2e3b4554
6 changed files with 53 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config/cmake_ext_mod/HDFMacros.cmake
View File

@@ -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 ()