Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[proj4] Fix the usage #19474

Merged
merged 10 commits into from
Aug 13, 2021
Merged

[proj4] Fix the usage #19474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0407911
[proj4] Fix the usage
PhoebeHui Aug 10, 2021
f81886a
Update the baseline
PhoebeHui Aug 10, 2021
29bfbc2
Small changes
PhoebeHui Aug 11, 2021
71796c3
Update the baseline version
PhoebeHui Aug 11, 2021
390c400
Remove PREFER_NINJA
PhoebeHui Aug 11, 2021
0d769af
Update the baseline revision
PhoebeHui Aug 11, 2021
d9a5fee
Update the version scheme
PhoebeHui Aug 11, 2021
d977a78
Update the baseline version
PhoebeHui Aug 11, 2021
498caf4
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Aug 12, 2021
d08828a
Avoid configure_file to fill out proj4.
BillyONeal Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ports/proj4/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion ports/proj4/usage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions ports/proj4/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5074,7 +5074,7 @@
},
"proj4": {
"baseline": "7.2.1",
"port-version": 3
"port-version": 4
},
"prometheus-cpp": {
"baseline": "0.12.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/proj4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c",
"version-semver": "7.2.1",
"port-version": 4
},
{
"git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d",
"version-string": "7.2.1",
Expand Down