diff options
| author | Dženan Zukić <dzenan.zukic@kitware.com> | 2019-04-02 23:35:44 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-04-02 20:35:44 -0700 |
| commit | 641e1cd53db09305530130c78ef2b473a52682a1 (patch) | |
| tree | d9324ac33ce410ec5baee28a123f9224e6a4bfe1 /ports/netcdf-c | |
| parent | 0fffb47ed02507aeacc29c64d91e9d4639f981f6 (diff) | |
| download | vcpkg-641e1cd53db09305530130c78ef2b473a52682a1.tar.gz vcpkg-641e1cd53db09305530130c78ef2b473a52682a1.zip | |
Fix double-conversion issue in ITK (#5115)
* Using newer version of ITK which fixes double-conversion problem
* Minor style update of ITK portfile
* Using newer version of ITK which fixes double-conversion problem
* [itk] Improve version string
* [itk][hdf5] Update ITK commit. Depend on eigen3. Bump hdf5 control version.
* [hdf5] Update CONTROL
* [netcdf-c] Disable parallel configure due to writes to source directory
* [hdf5] Disable parallel configure due to writes to source directory. Switch to tar.gz to prevent CRLF line endings.
Diffstat (limited to 'ports/netcdf-c')
| -rw-r--r-- | ports/netcdf-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/netcdf-c/portfile.cmake | 29 |
2 files changed, 9 insertions, 22 deletions
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index 33fe98162..512fdb8b2 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,4 +1,4 @@ Source: netcdf-c -Version: 4.6.2 +Version: 4.6.2-1 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. diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 4f8f67c96..4f9046106 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -1,22 +1,11 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - include(vcpkg_common_functions) -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.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} +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Unidata/netcdf-c + REF v4.6.2 + SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3 + HEAD_REF master PATCHES no-install-deps.patch config-pkg-location.patch @@ -26,7 +15,8 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA OPTIONS -DBUILD_UTILITIES=OFF -DBUILD_TESTING=OFF @@ -36,9 +26,6 @@ vcpkg_configure_cmake( -DENABLE_DAP_REMOTE_TESTS=OFF -DDISABLE_INSTALL_DEPENDENCIES=ON -DConfigPackageLocation=share/netcdf - - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 ) vcpkg_install_cmake() |