summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-01-09 22:38:54 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-01-09 22:38:54 (GMT)
commitfa2e3b45547d2c0988f24668afba82516520530d (patch)
tree9fda788bbfb8c68a15129d8bf4db33a0d6d13d4c /config
parent969fe0373e12256994bc8a704846d0257835ff76 (diff)
downloadhdf5-fa2e3b45547d2c0988f24668afba82516520530d.zip
hdf5-fa2e3b45547d2c0988f24668afba82516520530d.tar.gz
hdf5-fa2e3b45547d2c0988f24668afba82516520530d.tar.bz2
HDFFV-10385 correct platform issues
Diffstat (limited to 'config')
-rw-r--r--config/cmake/hdf5-config.cmake.in6
-rw-r--r--config/cmake_ext_mod/HDFMacros.cmake21
2 files changed, 4 insertions, 23 deletions
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index 01c27df..421f693 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -105,12 +105,6 @@ set (HDF5_VERSION_MINOR @HDF5_VERSION_MINOR@)
# project which has already built hdf5 as a subproject
#-----------------------------------------------------------------------------
if (NOT TARGET "@HDF5_PACKAGE@")
- if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "zlib")
- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
- endif ()
- if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "szip")
- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
- endif ()
include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
endif ()
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 ()