[proj] Update to 9.1.1 (#28157)

* [proj] Update to 9.1.1

* Trim patching

* Update versions
This commit is contained in:
Kai Pastor 2022-12-06 00:30:55 +01:00 committed by GitHub
parent e0e2f13940
commit 802998e89d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 30 deletions

View File

@ -34,14 +34,6 @@ index 7d736d129..2be8f8be9 100644
else()
message(SEND_ERROR
"libtiff dependency not found! Use ENABLE_TIFF=OFF to force it off")
@@ -171,6 +188,7 @@ if(ENABLE_CURL)
find_package(CURL REQUIRED)
if(CURL_FOUND)
set(CURL_ENABLED TRUE)
+ set(CURL_LIBRARY CURL::libcurl)
else()
message(SEND_ERROR "curl dependency not found!")
endif()
diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
index 7d5579ae..0cf96252 100644
--- a/cmake/project-config.cmake.in

View File

@ -1,13 +1,13 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/PROJ
REF 9.1.0
SHA512 0a0c887e14dc4dddc8ea3d1de01683cd81d9d6cc5788601aa224e1fecf46af10fb289e7260547431b35e4b771b020feccf04101135b86c6343221c8f446a766b
REF "${VERSION}"
SHA512 bdc3cba27f330829b30290f563cb1cded75d3861909399177334a354662f4cb54e05baef40b8d267978c746f41543c3de1c119ca08919c87fd9460506c5c566e
HEAD_REF master
PATCHES
fix-win-output-name.patch
fix-proj4-targets-cmake.patch
tools-cmake.patch
remove-doc.patch
)
@ -32,9 +32,10 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
-DNLOHMANN_JSON=external
-DPROJ_DATA_SUBDIR=share/${PORT}/data
-DBUILD_TESTING=OFF
"-DEXE_SQLITE3=${EXE_SQLITE3}"
OPTIONS_DEBUG
-DBUILD_APPS=OFF
)
vcpkg_cmake_install()

View File

@ -1,15 +0,0 @@
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
index 534bc311b..f9fb0f1bb 100644
--- a/src/apps/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -83,10 +83,3 @@ if(BUILD_PROJSYNC)
# global configurations for all apps
-if(MSVC OR CMAKE_CONFIGURATION_TYPES)
- if(BIN_TARGETS)
- # Add _d suffix for debug versions of the apps
- set_target_properties(${BIN_TARGETS} PROPERTIES
- DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
- endif()
-endif()

View File

@ -1,4 +1,4 @@
The package proj provides CMake targets:
proj provides CMake targets:
find_package(PROJ CONFIG REQUIRED)
target_link_libraries(main PRIVATE PROJ::proj)

View File

@ -1,6 +1,6 @@
{
"name": "proj",
"version": "9.1.0",
"version": "9.1.1",
"description": "PROJ library for cartographic projections",
"homepage": "https://proj.org/",
"license": "MIT",

View File

@ -5953,7 +5953,7 @@
"port-version": 1
},
"proj": {
"baseline": "9.1.0",
"baseline": "9.1.1",
"port-version": 0
},
"proj4": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5ae85e19024d23a2ae8c22c16bab44f2fc236a4a",
"version": "9.1.1",
"port-version": 0
},
{
"git-tree": "7c8c2418c56d4f5b5dfd6e1d8e95b008f03ea63f",
"version": "9.1.0",