diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-02-14 11:03:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 19:03:58 -0800 |
| commit | 90114a0e2ecfc983d496720debbfec3a4c4d84ac (patch) | |
| tree | 3149ec565a89f8d5c940309ec5f6b85a19fc95d8 | |
| parent | 2523a19f70741a0383cd3bc8bedd8c5e52b9b54e (diff) | |
| download | vcpkg-90114a0e2ecfc983d496720debbfec3a4c4d84ac.tar.gz vcpkg-90114a0e2ecfc983d496720debbfec3a4c4d84ac.zip | |
[proj4] Fix the feature database judgment (#8763)
* [proj4]Fix the feature database judgment.
* [proj4]Re-fix sqlite tool judgment.
| -rw-r--r-- | ports/proj4/portfile.cmake | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 05ef8f8e3..7ead08720 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -22,22 +22,19 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS database BUILD_PROJ_DATABASE ) - 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.exe) - message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.") - endif() + if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe) 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.exe) - message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x64-windows first.") - endif() + 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) else() - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/tools) + message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.") endif() else() set(BIN_SUFFIX) |