diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:33:56 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:33:56 +0100 |
| commit | 1ee65c19dd5d65c9f08ac5e205101057691b7033 (patch) | |
| tree | 9d01e69a1375dc296ff5bfc27cafe2c35d543f52 | |
| parent | 6c3c6737ba3c32f6d38f9d4ea0106a1e23e7b7da (diff) | |
| download | vcpkg-1ee65c19dd5d65c9f08ac5e205101057691b7033.tar.gz vcpkg-1ee65c19dd5d65c9f08ac5e205101057691b7033.zip | |
correct hdf5 usage in netcdf-cxx4
| -rw-r--r-- | ports/netcdf-cxx4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/netcdf-cxx4/portfile.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/netcdf-cxx4/CONTROL b/ports/netcdf-cxx4/CONTROL index a3b7278a6..0d21780ae 100644 --- a/ports/netcdf-cxx4/CONTROL +++ b/ports/netcdf-cxx4/CONTROL @@ -1,4 +1,4 @@ Source: netcdf-cxx4 -Version: 4.3.0-1 +Version: 4.3.0-2 Build-Depends: netcdf-c Description: a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-cxx4/portfile.cmake b/ports/netcdf-cxx4/portfile.cmake index 22e4e1653..68dcbf661 100644 --- a/ports/netcdf-cxx4/portfile.cmake +++ b/ports/netcdf-cxx4/portfile.cmake @@ -6,6 +6,10 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # +if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static") + set(HDF5_USE_STATIC_LIBRARIES ON) +endif() + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") message(STATUS "Warning: DLLs not supported yet. Building static.") set(VCPKG_LIBRARY_LINKAGE static) @@ -31,6 +35,7 @@ vcpkg_configure_cmake( OPTIONS -DNCXX_ENABLE_TESTS=OFF -DCMAKE_INSTALL_CMAKECONFIGDIR=share/netCDFCxx + -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES} # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) |