Skip to content

[proj] Update to 9.0.1 #25257

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

Merged
dan-shaw merged 2 commits into from
Jun 16, 2022
Merged

[proj] Update to 9.0.1 #25257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce6def8
Update to 9.0.1
dg0yt Jun 15, 2022
72fa717
Update versions
dg0yt Jun 15, 2022
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
16 changes: 6 additions & 10 deletions ports/proj/fix-proj4-targets-cmake.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,17 @@ diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
index 23f997abd..8baef00f0 100644
--- a/cmake/project-config.cmake.in
+++ b/cmake/project-config.cmake.in
@@ -7,6 +7,17 @@
# @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib
# @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin
@@ -9,6 +9,13 @@
# @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example)

include(CMakeFindDependencyMacro)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0012 NEW)
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-sqlite3 CONFIG)
+if("@ENABLE_TIFF@")
+ find_dependency(TIFF)
+endif()
+if("@ENABLE_CURL@")
+ find_dependency(CURL CONFIG)
+endif()
+cmake_policy(POP)

# Tell the user project where to find our headers and libraries
get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
if("@CURL_ENABLED@" STREQUAL "TRUE")
# Chainload CURL usage requirements
find_dependency(CURL)
4 changes: 2 additions & 2 deletions ports/proj/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/PROJ
REF 9.0.0
SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520
REF 9.0.1
SHA512 b92a196e6801dd8d77e6c2131e15a392077e8e049a6d9befdb39ee035a3cca5a725b95196b29a4c5d7bad4d826a285e40abc3fdc040b5e11ede5c04ba4f6dbb5
HEAD_REF master
PATCHES
fix-win-output-name.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/proj/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "proj",
"version": "9.0.0",
"version": "9.0.1",
"description": "PROJ library for cartographic projections",
"homepage": "https://proj.org/",
"license": "MIT",
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 @@ -5609,7 +5609,7 @@
"port-version": 1
},
"proj": {
"baseline": "9.0.0",
"baseline": "9.0.1",
"port-version": 0
},
"proj4": {
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/proj.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55c13547b4c812fc8bbb32a09260b3e54bc0a352",
"version": "9.0.1",
"port-version": 0
},
{
"git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16",
"version": "9.0.0",
Expand Down