diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-08-14 04:41:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 13:41:32 -0700 |
| commit | 612102b82840a47af0c6ab26135ff633f41dcd82 (patch) | |
| tree | a70ffe8f7738dec40b4c5c3bc3919d9694b8eab6 | |
| parent | 7e396645d919f463ef6f0f2ad6a8c5272c1f9b27 (diff) | |
| download | vcpkg-612102b82840a47af0c6ab26135ff633f41dcd82.tar.gz vcpkg-612102b82840a47af0c6ab26135ff633f41dcd82.zip | |
[proj4] Fix the usage (#19474)
* [proj4] Fix the usage
* Update the baseline
* Small changes
* Update the baseline version
* Remove PREFER_NINJA
* Update the baseline revision
* Update the version scheme
* Update the baseline version
* Avoid configure_file to fill out proj4.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/proj4/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/proj4/usage | 2 | ||||
| -rw-r--r-- | ports/proj4/vcpkg.json | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/proj4.json | 5 |
5 files changed, 12 insertions, 8 deletions
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index feff73e4f..c19e07b07 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -44,7 +44,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DPROJ_LIB_SUBDIR=lib -DPROJ_INCLUDE_SUBDIR=include @@ -65,7 +64,7 @@ endif () file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - vcpkg_copy_pdbs() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proj4/usage b/ports/proj4/usage index a2297ca02..ebf9f6c8d 100644 --- a/ports/proj4/usage +++ b/ports/proj4/usage @@ -1,4 +1,4 @@ -The package ${PORT}:${TARGET_TRIPLET} provides CMake targets: +The package proj4 provides CMake targets: find_package(PROJ CONFIG REQUIRED) target_link_libraries(main PRIVATE PROJ::proj) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 234f92494..770896f9c 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", - "version-string": "7.2.1", - "port-version": 3, + "version-semver": "7.2.1", + "port-version": 4, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cb50c1f40..93c21df74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5074,7 +5074,7 @@ }, "proj4": { "baseline": "7.2.1", - "port-version": 3 + "port-version": 4 }, "prometheus-cpp": { "baseline": "0.12.3", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index d5bbf1d9a..077e213aa 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c", + "version-semver": "7.2.1", + "port-version": 4 + }, + { "git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d", "version-string": "7.2.1", "port-version": 3 |