From 552f508ffc6d0a792f64bbccaf773a49dda815df Mon Sep 17 00:00:00 2001 From: Lars Glud Date: Thu, 11 Jun 2020 10:10:02 +0200 Subject: [PATCH] [PROJ4] Add search path for sqlite.exe (#11086) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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> --- ports/proj4/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index cdb55c05942..be633ef0ce6 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()