update netcdf-c tp 4.6.2 and fixed curl linkage

This commit is contained in:
Alexander Neumann 2019-03-14 22:30:51 +01:00
parent 4de9cb0f1b
commit 0e898fe892
3 changed files with 21 additions and 8 deletions

View File

@ -1,4 +1,4 @@
Source: netcdf-c
Version: 4.4.1.1-2
Version: 4.6.2
Build-Depends: hdf5, curl
Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.

View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb0bc26b..f1409fc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -783,6 +783,7 @@ IF(ENABLE_DAP)
ADD_DEFINITIONS(-DCURL_STATICLIB=1)
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+ LINK_LIBRARIES(${CURL_LIBRARIES})
# Check to see if CURLOPT_USERNAME is defined.
# It is present starting version 7.19.1.

View File

@ -7,20 +7,21 @@
#
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/netcdf-c-4.4.1.1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/netcdf-c-4.6.2)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/Unidata/netcdf-c/archive/v4.4.1.1.zip"
FILENAME "netcdf-c-v4.4.1.1.zip"
SHA512 8d31e47f0bd4d5c8640d3444c5c83425862ed1e8283aa78419e86b18d33fd93bfeb0067e8e9630457cb9c334d6fedf630283b5227a15137a3e153d57b22364a8
URLS "https://github.com/Unidata/netcdf-c/archive/v4.6.2.tar.gz"
FILENAME "netcdf-c-v4.6.2.tar.gz"
SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/no-install-deps.patch
${CMAKE_CURRENT_LIST_DIR}/config-pkg-location.patch
${CMAKE_CURRENT_LIST_DIR}/transitive-hdf5.patch
no-install-deps.patch
config-pkg-location.patch
transitive-hdf5.patch
fix_curl_linkage.patch
)
vcpkg_configure_cmake(