-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [cmake] update to 3.19.0 * update vmss * [cmake] update to 3.19.1 * [solid3] Fix configure error, fix static definition * [flann] Add feature hdf5 and fix it * [highfive] Fix dependency hdf5 * [simage] Fix configure error * [aws-c-common] Fix configure error * [cmake] Update to 3.19.2 * Revert changes about cmake bug * [VMSS] Update cmake path on Windows * [cmake] Update cmake hash * [minc] Fix dependency hdf5 * [cmake] Update cmake package name and path on MacOS Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
- Loading branch information
1 parent
580da70
commit 8f8f716
Showing
11 changed files
with
141 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| Source: flann | ||
| Version: 2019-04-07-1 | ||
| Version: 2019-04-07 | ||
| Port-Version: 1 | ||
| Homepage: https://github.com/mariusmuja/flann | ||
| Build-Depends: lz4 | ||
| Description: Fast Library for Approximate Nearest Neighbors | ||
|
|
||
| Feature: hdf5 | ||
| Build-Depends: hdf5 | ||
| Description: Build with hdf5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 7ff331a..155cabe 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -75,11 +75,17 @@ if (NOT PYTHON_EXECUTABLE) | ||
| endif() | ||
| endif() | ||
|
|
||
| +if (WITH_HDF5) | ||
| find_hdf5() | ||
| -if (NOT HDF5_FOUND) | ||
| - message(WARNING "hdf5 library not found, some tests will not be run") | ||
| +if (NOT hdf5_FOUND) | ||
| + message(ERROR "hdf5 library not found") | ||
| else() | ||
| - include_directories(${HDF5_INCLUDE_DIR}) | ||
| + if (TARGET hdf5::hdf5-shared) | ||
| + link_libraries(hdf5::hdf5-shared) | ||
| + elseif (TARGET hdf5::hdf5-static) | ||
| + link_libraries(hdf5::hdf5-static) | ||
| + endif() | ||
| +endif() | ||
| endif() | ||
|
|
||
| if (USE_MPI OR HDF5_IS_PARALLEL) | ||
| diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake | ||
| index 8aef8e0..747414f 100644 | ||
| --- a/cmake/flann_utils.cmake | ||
| +++ b/cmake/flann_utils.cmake | ||
| @@ -21,21 +21,8 @@ endmacro(DISSECT_VERSION) | ||
|
|
||
| # workaround a FindHDF5 bug | ||
| macro(find_hdf5) | ||
| - find_package(HDF5) | ||
| - | ||
| - set( HDF5_IS_PARALLEL FALSE ) | ||
| - foreach( _dir ${HDF5_INCLUDE_DIRS} ) | ||
| - if( EXISTS "${_dir}/H5pubconf.h" ) | ||
| - file( STRINGS "${_dir}/H5pubconf.h" | ||
| - HDF5_HAVE_PARALLEL_DEFINE | ||
| - REGEX "HAVE_PARALLEL 1" ) | ||
| - if( HDF5_HAVE_PARALLEL_DEFINE ) | ||
| - set( HDF5_IS_PARALLEL TRUE ) | ||
| - endif() | ||
| - endif() | ||
| - endforeach() | ||
| - set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL | ||
| - "HDF5 library compiled with parallel IO support" ) | ||
| + find_package(hdf5 CONFIG) | ||
| + set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL}) | ||
| mark_as_advanced( HDF5_IS_PARALLEL ) | ||
| endmacro(find_hdf5) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake | ||
| index f76e1d3..06ac647 100644 | ||
| --- a/CMake/HighFiveTargetDeps.cmake | ||
| +++ b/CMake/HighFiveTargetDeps.cmake | ||
| @@ -8,7 +8,13 @@ add_library(libdeps INTERFACE) | ||
| if(NOT DEFINED HDF5_C_LIBRARIES) | ||
| set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE) # Consistency | ||
| set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5}) | ||
| - find_package(HDF5 REQUIRED) | ||
| + find_package(hdf5 CONFIG REQUIRED) | ||
| + set(HIGHFIVE_PARALLEL_HDF5 ${HDF5_ENABLE_PARALLEL}) | ||
| + if (TARGET hdf5::hdf5-shared) | ||
| + set(HDF5_C_LIBRARIES hdf5::hdf5-shared) | ||
| + elseif (TARGET hdf5::hdf5-static) | ||
| + set(HDF5_C_LIBRARIES hdf5::hdf5-static) | ||
| + endif() | ||
| endif() | ||
|
|
||
| if(HIGHFIVE_PARALLEL_HDF5 AND NOT HDF5_IS_PARALLEL) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index a6830b4..da3d635 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -65,7 +65,12 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED) | ||
| # external packages | ||
| FIND_PACKAGE(ZLIB REQUIRED) | ||
| SET(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON) | ||
| - FIND_PACKAGE(HDF5 REQUIRED COMPONENTS C ) | ||
| + FIND_PACKAGE(hdf5 CONFIG REQUIRED) | ||
| + if (TARGET hdf5::hdf5-shared) | ||
| + SET(HDF5_LIBRARIES hdf5::hdf5-shared) | ||
| + elseif (TARGET hdf5::hdf5-static) | ||
| + SET(HDF5_LIBRARIES hdf5::hdf5-static) | ||
| + endif() | ||
|
|
||
| IF (LIBMINC_USE_SYSTEM_NIFTI) | ||
| FIND_PACKAGE(NIFTI) | ||
| @@ -515,12 +520,8 @@ IF(SUPERBUILD_STAGING_PREFIX) | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" LIBMINC_LIBRARIES_CONFIG "${LIBMINC_LIBRARIES_CONFIG}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" EZMINC_LIBRARIES "${EZMINC_LIBRARIES}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_INCLUDE_DIR "${NETCDF_INCLUDE_DIR}") | ||
| - STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}") | ||
| - STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIRS}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_INCLUDE_DIR "${NIFTI_INCLUDE_DIR}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_LIBRARY "${NETCDF_LIBRARY}") | ||
| - STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARY "${HDF5_LIBRARY}") | ||
| - STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARIES "${HDF5_LIBRARIES}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_LIBRARY "${NIFTI_LIBRARY}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZNZ_LIBRARY "${ZNZ_LIBRARY}") | ||
| STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZLIB_LIBRARY "${ZLIB_LIBRARY}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters