diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-12-15 00:15:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 00:15:39 (GMT) |
| commit | d673ee0cdd826100f6c914ea0851d742699ed740 (patch) | |
| tree | d0ff5f967748b525275c3f37526d33aab87c702c /config/cmake_ext_mod | |
| parent | 629fcdb3d05edeab2f72838e595b5cae1c858c97 (diff) | |
| download | hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.zip hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.tar.gz hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.tar.bz2 | |
OESS-98 Update plugin build option - HDF5 1 12 (#173)
* merge updates from develop
* remove extension on command
* Run autogen before chkmanifest
* Update release text files and whitespace cleanup
* Update list
* OESS-98 Update plugin build option
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/HDFLibMacros.cmake | 15 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake index 9704fbd..fe633bf 100644 --- a/config/cmake_ext_mod/HDFLibMacros.cmake +++ b/config/cmake_ext_mod/HDFLibMacros.cmake @@ -84,10 +84,6 @@ endmacro () #------------------------------------------------------------------------------- macro (EXTERNAL_SZIP_LIBRARY compress_type encoding) if (${compress_type} MATCHES "GIT") -# FetchContent_Declare (SZIP -# GIT_REPOSITORY ${SZIP_URL} -# GIT_TAG ${SZIP_BRANCH} -# ) EXTERNALPROJECT_ADD (SZIP GIT_REPOSITORY ${SZIP_URL} GIT_TAG ${SZIP_BRANCH} @@ -108,10 +104,6 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding) -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE} ) elseif (${compress_type} MATCHES "TGZ") -# FetchContent_Declare (SZIP -# URL ${SZIP_URL} -# URL_HASH "" -# ) EXTERNALPROJECT_ADD (SZIP URL ${SZIP_URL} URL_MD5 "" @@ -133,12 +125,7 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding) ) endif () externalproject_get_property (SZIP BINARY_DIR SOURCE_DIR) -# FetchContent_GetProperties(SZIP) -# if(NOT SZIP_POPULATED) -# FetchContent_Populate(SZIP) -# add_subdirectory(${szip_SOURCE_DIR} ${szip_BINARY_DIR}) -# endif() -# + ##include (${BINARY_DIR}/${SZ_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake) # Create imported target szip-static if (USE_LIBAEC) diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 8ca8159..952b766 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -429,6 +429,19 @@ macro (HDF_DIR_PATHS package_prefix) endif () endif () + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + if (CMAKE_HOST_UNIX) + set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + else () + GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) + set (CMAKE_INSTALL_PREFIX + "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + set (CMAKE_GENERIC_PROGRAM_FILES) + endif () + endif () + #----------------------------------------------------------------------------- # Setup pre-3.14 FetchContent #----------------------------------------------------------------------------- |