diff options
Diffstat (limited to 'ports/proj4')
| -rw-r--r-- | ports/proj4/portfile.cmake | 22 | ||||
| -rw-r--r-- | ports/proj4/vcpkg.json | 6 |
2 files changed, 5 insertions, 23 deletions
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index e603d4af5..e0880683a 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -38,25 +38,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() if ("database" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - set(BIN_SUFFIX .exe) - if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe) - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools) - elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/sqlite3.exe) - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools) - elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3.exe AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")) - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools) - elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/sqlite3.exe AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")) - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools) - elseif (NOT TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND EXISTS ${CURRENT_INSTALLED_DIR}/tools/sqlite3.exe) - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/tools) - else() - message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.") - endif() - else() - set(BIN_SUFFIX) - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/tools) - endif() + set(EXE_SQLITE3 ${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}) endif() vcpkg_configure_cmake( @@ -67,7 +49,7 @@ vcpkg_configure_cmake( -DPROJ_INCLUDE_SUBDIR=include -DPROJ_DATA_SUBDIR=share/${PORT} -DBUILD_TESTING=OFF - -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3${BIN_SUFFIX} + -DEXE_SQLITE3=${EXE_SQLITE3} ) vcpkg_install_cmake() diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 629feec02..a6c8f8b43 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", "version-string": "7.2.1", - "port-version": 1, + "port-version": 2, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ @@ -20,10 +20,10 @@ "dependencies": [ { "name": "sqlite3", + "host": true, "features": [ "tool" - ], - "platform": "!uwp & !arm" + ] } ] }, |