diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index feff73e4fcbce9..c19e07b076dfa2 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 a2297ca02b2729..ebf9f6c8d5aae1 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 234f924946256d..770896f9c5f12c 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 02fa424c766602..64dbffc9dec250 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 d5bbf1d9afb6a4..077e213aa2445a 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c", + "version-semver": "7.2.1", + "port-version": 4 + }, { "git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d", "version-string": "7.2.1",