diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-03-14 23:12:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 23:12:31 -0700 |
| commit | d72e38036ba1eedeed87cf65c6673df37d0cc2b1 (patch) | |
| tree | 8bf6b3067bab819836870f8aea0d44fbfc287a92 /ports/highfive | |
| parent | 7d701a92a36fa665b860643b7837d5f18d9fd9cd (diff) | |
| parent | d5fbb5e0e7038dbcdae21c2b956c3213331a6fd6 (diff) | |
| download | vcpkg-d72e38036ba1eedeed87cf65c6673df37d0cc2b1.tar.gz vcpkg-d72e38036ba1eedeed87cf65c6673df37d0cc2b1.zip | |
Merge pull request #5574 from Neumann-A/VTK_8.2.0
[VTK 8.2.0/HDF5 1.10.5] Upgrade VTK and HDF5
Diffstat (limited to 'ports/highfive')
| -rw-r--r-- | ports/highfive/CONTROL | 2 | ||||
| -rw-r--r-- | ports/highfive/portfile.cmake | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ports/highfive/CONTROL b/ports/highfive/CONTROL index 22c7d616b..b82598048 100644 --- a/ports/highfive/CONTROL +++ b/ports/highfive/CONTROL @@ -1,4 +1,4 @@ Source: highfive -Version: 1.5 +Version: 1.5-1 Description: HighFive is a modern C++/C++11 friendly interface for libhdf5 Build-Depends: hdf5 diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index 72f644e0e..b0fe41e73 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( HEAD_REF master ) +if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static") + set(HDF5_USE_STATIC_LIBRARIES ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -16,6 +20,7 @@ vcpkg_configure_cmake( -DHIGHFIVE_EXAMPLES=OFF -DUSE_BOOST=OFF -DHIGH_FIVE_DOCUMENTATION=OFF + -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES} ) vcpkg_install_cmake() @@ -23,6 +28,9 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/HighFive/CMake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +if(NOT WIN32) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/HighFive) +endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/highfive RENAME copyright) |