Skip to content

Commit

Permalink
lib/proj/patches/no_data: do not search for "sqlite3" program
Browse files Browse the repository at this point in the history
This is only needed for generating data files.
  • Loading branch information
MaxKellermann committed May 30, 2023
1 parent ba15a67 commit 8675a3e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
1 change: 0 additions & 1 deletion doc/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ On Debian::
sudo apt-get install
default-jdk-headless \
vorbis-tools \
sqlite3 \
adb

The required Android SDK components are:
Expand Down
4 changes: 2 additions & 2 deletions ide/provisioning/install-debian-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ apt-get install ${APTOPTS[*]} \
echo

echo Installing dependencies for the Android target, not including SDK / NDK...
apt-get install ${APTOPTS[*]} openjdk-11-jdk-headless vorbis-tools adb libtool unzip \
sqlite3
apt-get install ${APTOPTS[*]} openjdk-11-jdk-headless vorbis-tools adb libtool \
unzip
echo

echo Clean up downloaded resources in order to free space
Expand Down
24 changes: 18 additions & 6 deletions lib/proj/patches/no_data
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
commit 65708880af2830230992f453b8dc5e9ca999bee8
commit b6007421eb99bcf8ad65390f9a3c96f7973d995a
Author: Max Kellermann <max.kellermann@gmail.com>
Date: Thu Aug 11 09:10:26 2022 +0200

CMakeLists.txt: don't generate and install data

Index: proj-9.1.0/CMakeLists.txt
===================================================================
--- proj-9.1.0.orig/CMakeLists.txt
+++ proj-9.1.0/CMakeLists.txt
@@ -323,7 +323,6 @@ endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be05dd53..88562fc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,11 +171,6 @@ message(STATUS "nlohmann/json: ${NLOHMANN_JSON}")
# Check for sqlite3
################################################################################

-find_program(EXE_SQLITE3 sqlite3)
-if(NOT EXE_SQLITE3)
- message(SEND_ERROR "sqlite3 binary not found!")
-endif()
-
find_package(Sqlite3 REQUIRED)
if(NOT SQLITE3_FOUND)
message(SEND_ERROR "sqlite3 dependency not found!")
@@ -323,7 +318,6 @@ endif()
################################################################################
include_directories(${PROJ_SOURCE_DIR}/src)

Expand Down

0 comments on commit 8675a3e

Please sign in to comment.