diff --git a/ports/proj/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch index 8f5f625d96..f7833fc29a 100644 --- a/ports/proj/fix-proj4-targets-cmake.patch +++ b/ports/proj/fix-proj4-targets-cmake.patch @@ -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 diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index 36c60274b8..f8d624dbb3 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -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() diff --git a/ports/proj/tools-cmake.patch b/ports/proj/tools-cmake.patch deleted file mode 100644 index cc76be215d..0000000000 --- a/ports/proj/tools-cmake.patch +++ /dev/null @@ -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() diff --git a/ports/proj/usage b/ports/proj/usage index a1236dde61..59044f7d29 100644 --- a/ports/proj/usage +++ b/ports/proj/usage @@ -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) diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index 77f6414d39..b6fca927e4 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 7b15d04098..0999f4d7f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5953,7 +5953,7 @@ "port-version": 1 }, "proj": { - "baseline": "9.1.0", + "baseline": "9.1.1", "port-version": 0 }, "proj4": { diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 7ca1c2bbf8..6be203042e 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ae85e19024d23a2ae8c22c16bab44f2fc236a4a", + "version": "9.1.1", + "port-version": 0 + }, { "git-tree": "7c8c2418c56d4f5b5dfd6e1d8e95b008f03ea63f", "version": "9.1.0",