diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-01-09 14:36:56 -0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-09 14:36:56 -0800 |
| commit | 6ece7aea9cfbe56071405861dcebcece56ec0c7a (patch) | |
| tree | 147facd2760312f3752234e0c8330e369dfb8ead /ports/proj4 | |
| parent | 9b897498efb554b397d28aea2821b0fd3dc0369e (diff) | |
| download | vcpkg-6ece7aea9cfbe56071405861dcebcece56ec0c7a.tar.gz vcpkg-6ece7aea9cfbe56071405861dcebcece56ec0c7a.zip | |
[sqlite3] Rename sqlite3 tool as sqlite3.exe (#9437)
* [sqlite3] Rename sqlite3 tool as sqlite3.exe
* Update rename sqlite3-bin.exe condition
* [proj4] Fix the regressions cause by sqlite3
Diffstat (limited to 'ports/proj4')
| -rw-r--r-- | ports/proj4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/proj4/portfile.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index d26e94449..0bcabb5a6 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,5 +1,5 @@ Source: proj4 -Version: 6.2.1-1 +Version: 6.2.1-2 Homepage: https://github.com/OSGeo/PROJ Description: PROJ.4 library for cartographic projections Build-Depends: sqlite3[core] diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 89eee4860..dc91d41a5 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -28,12 +28,12 @@ if ("database" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) set(BIN_SUFFIX .exe) if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3-bin.exe) + if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe) message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.") endif() set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools) elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)) - if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3-bin.exe) + if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3.exe) message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x64-windows first.") endif() set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools) @@ -61,7 +61,7 @@ vcpkg_configure_cmake( -DBUILD_PROJ=OFF -DBUILD_PROJINFO=OFF -DPROJ_TESTS=OFF - -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3-bin${BIN_SUFFIX} + -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3${BIN_SUFFIX} ) vcpkg_install_cmake() |