diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-06-08 23:08:59 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-06-08 14:08:59 -0700 |
| commit | 2ca347614929463fed9a3075902d455929026fa4 (patch) | |
| tree | 72e9746e4378512db6cfb9b5d12e0709ba6acf9f /ports/hdf5 | |
| parent | 388d219f256b75452c088b4cc2e16fd38f7f6995 (diff) | |
| download | vcpkg-2ca347614929463fed9a3075902d455929026fa4.tar.gz vcpkg-2ca347614929463fed9a3075902d455929026fa4.zip | |
[netcdf-c/hdf5] improve/correct linkage (#6771)
* [netcdf_c] improve HDF5 linkage
* [hdf5] add required HDF5 definitions not set by findHDF5
* [netcdf-c] Call chain HDF5: -> vcpkg_cmake_wrapper (old behvior)
-> port supplied FindHDF5 -> includes hdf5Config from HDF5_ROOT
* [hdf5] fix szip linkage...again..
will now double link against szip target but thats better than before
the double link issue does not hurt and should be resolved upstream
* revert find_dependency
requires include(CMakeFindDependencyMacro)
* [netcdf-c] removed unnecessary patch
Diffstat (limited to 'ports/hdf5')
| -rw-r--r-- | ports/hdf5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/hdf5/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/hdf5/vcpkg-cmake-wrapper.cmake | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL index 6ec2cea9b..19939c95a 100644 --- a/ports/hdf5/CONTROL +++ b/ports/hdf5/CONTROL @@ -1,5 +1,5 @@ Source: hdf5
-Version: 1.10.5-5
+Version: 1.10.5-6
Description: HDF5 is a data model, library, and file format for storing and managing data
Build-Depends: zlib, szip
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index cb1541fed..593b38abf 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -33,6 +33,7 @@ endif() #Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) +file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE @@ -50,6 +51,7 @@ vcpkg_configure_cmake( -DHDF5_INSTALL_CMAKE_DIR=share ) + vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/hdf5/vcpkg-cmake-wrapper.cmake b/ports/hdf5/vcpkg-cmake-wrapper.cmake index 96d8a53c9..695befcdc 100644 --- a/ports/hdf5/vcpkg-cmake-wrapper.cmake +++ b/ports/hdf5/vcpkg-cmake-wrapper.cmake @@ -6,8 +6,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(HDF5_USE_STATIC_LIBRARIES ON)
+ add_compile_definitions(H5_BUILT_AS_STATIC_LIB)
else()
set(HDF5_USE_STATIC_LIBRARIES OFF)
+ add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB)
endif()
endif()
cmake_policy(POP)
|