aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Glud <larshg@gmail.com>2020-06-11 10:10:02 +0200
committerGitHub <noreply@github.com>2020-06-11 01:10:02 -0700
commit552f508ffc6d0a792f64bbccaf773a49dda815df (patch)
tree158ac9afa666dbac2245771f99ac4d2cbdd01e11
parent9574e60a26af7a7a8b14439cc37b86cc8ae55a4b (diff)
downloadvcpkg-552f508ffc6d0a792f64bbccaf773a49dda815df.tar.gz
vcpkg-552f508ffc6d0a792f64bbccaf773a49dda815df.zip
[PROJ4] Add search path for sqlite.exe (#11086)
* Add additional search path * Update ports/proj4/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
-rw-r--r--ports/proj4/portfile.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index cdb55c059..be633ef0c 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -33,6 +33,8 @@ if ("database" IN_LIST FEATURES)
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()