aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-02-08 14:06:41 -0800
committerGitHub <noreply@github.com>2021-02-08 14:06:41 -0800
commit7a438171d6e51b7909815b1268f19fd0e46dbed1 (patch)
tree795053e524fa0e1a38b7eb726e6680e7bfd25837
parent8a95605a7b757d7a66f4f6e972780e2eaf62d67d (diff)
downloadvcpkg-7a438171d6e51b7909815b1268f19fd0e46dbed1.tar.gz
vcpkg-7a438171d6e51b7909815b1268f19fd0e46dbed1.zip
[netcdf-c] Fix usage (#16085)
* [netcdf-c] Fix usage * update version record
-rw-r--r--ports/netcdf-c/CONTROL2
-rw-r--r--ports/netcdf-c/portfile.cmake3
-rw-r--r--ports/netcdf-c/usage4
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/n-/netcdf-c.json5
5 files changed, 8 insertions, 8 deletions
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
index 3f164781c..f770d3020 100644
--- a/ports/netcdf-c/CONTROL
+++ b/ports/netcdf-c/CONTROL
@@ -1,6 +1,6 @@
Source: netcdf-c
Version: 4.7.4
-Port-Version: 1
+Port-Version: 2
Build-Depends: hdf5, curl
Homepage: https://github.com/Unidata/netcdf-c
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 bef7d9893..23e20f462 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -41,7 +41,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
@@ -50,5 +50,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
diff --git a/ports/netcdf-c/usage b/ports/netcdf-c/usage
deleted file mode 100644
index 681a20f8c..000000000
--- a/ports/netcdf-c/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package netcdf-c provides CMake targets:
-
- find_package(netCDF CONFIG REQUIRED)
- target_link_libraries(main PRIVATE netcdf)
diff --git a/versions/baseline.json b/versions/baseline.json
index c303ef502..b811af708 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4030,7 +4030,7 @@
},
"netcdf-c": {
"baseline": "4.7.4",
- "port-version": 1
+ "port-version": 2
},
"netcdf-cxx4": {
"baseline": "4.3.1",
diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json
index 45c3f61a0..d30a4c2ad 100644
--- a/versions/n-/netcdf-c.json
+++ b/versions/n-/netcdf-c.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "aa42781f00db0c2de52798f0345801b667977c79",
+ "version-string": "4.7.4",
+ "port-version": 2
+ },
+ {
"git-tree": "725a87fc08fed5789a9a4a3308b2a80f4906a400",
"version-string": "4.7.4",
"port-version": 1