aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/netcdf-c/portfile.cmake3
-rw-r--r--ports/netcdf-c/vcpkg.json4
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/n-/netcdf-c.json5
4 files changed, 10 insertions, 4 deletions
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
index 468237d2c..f51081d8b 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -60,7 +60,8 @@ if("tools" IN_LIST FEATURES)
TOOL_NAMES nccopy ncdump ncgen ncgen3
AUTO_CLEAN
)
-elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
+ # delete bin under non-windows because the dynamic libraries get put in lib
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin")
endif()
diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json
index 6e6523608..256a401b4 100644
--- a/ports/netcdf-c/vcpkg.json
+++ b/ports/netcdf-c/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "netcdf-c",
- "version-string": "4.7.4",
- "port-version": 3,
+ "version": "4.7.4",
+ "port-version": 4,
"description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.",
"homepage": "https://github.com/Unidata/netcdf-c",
"dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index e313e7af8..f0f9883a0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4450,7 +4450,7 @@
},
"netcdf-c": {
"baseline": "4.7.4",
- "port-version": 3
+ "port-version": 4
},
"netcdf-cxx4": {
"baseline": "4.3.1",
diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json
index 75fcc46b1..4b1157b9a 100644
--- a/versions/n-/netcdf-c.json
+++ b/versions/n-/netcdf-c.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6af71c6bbdb51d1cbbade70010ccf9c628938ac2",
+ "version": "4.7.4",
+ "port-version": 4
+ },
+ {
"git-tree": "069ccb40f8ce75d6ec88b8fe31966c11fcf6906b",
"version-string": "4.7.4",
"port-version": 3