From 6c4b88ad1196936aaa5a59ec9a35ae6c757ba65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Traizet?= Date: Thu, 21 Oct 2021 09:35:29 +0200 Subject: [PATCH 1/5] ENH: update sqlite version to 3.36 --- SuperBuild/CMake/External_sqlite.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/CMake/External_sqlite.cmake b/SuperBuild/CMake/External_sqlite.cmake index 361cad026b..eb63f9cab6 100644 --- a/SuperBuild/CMake/External_sqlite.cmake +++ b/SuperBuild/CMake/External_sqlite.cmake @@ -24,8 +24,8 @@ SETUP_SUPERBUILD(SQLITE) ExternalProject_Add(SQLITE PREFIX SQLITE - URL "https://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip" - URL_MD5 b1cbcbd710bdfd762dc169f1676053b5 + URL "https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip" + URL_MD5 c5d360c74111bafae1b704721ff18fe6 SOURCE_DIR ${SQLITE_SB_SRC} BINARY_DIR ${SQLITE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} -- GitLab From 08ffab804628e46bc50efa0918eebaa1aedc8517 Mon Sep 17 00:00:00 2001 From: Thibaut ROMAIN Date: Fri, 26 Nov 2021 09:33:52 +0100 Subject: [PATCH 2/5] COMP: clean cmakelist for sqlite --- SuperBuild/patches/SQLITE/CMakeLists.txt | 8 ++++++-- SuperBuild/patches/SQLITE/sqlite3_win.c | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 SuperBuild/patches/SQLITE/sqlite3_win.c diff --git a/SuperBuild/patches/SQLITE/CMakeLists.txt b/SuperBuild/patches/SQLITE/CMakeLists.txt index 583de68887..58552488ce 100644 --- a/SuperBuild/patches/SQLITE/CMakeLists.txt +++ b/SuperBuild/patches/SQLITE/CMakeLists.txt @@ -30,9 +30,13 @@ add_definitions(-DSQLITE_ENABLE_RTREE=1) add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION=1) add_definitions(-DSQLITE_THREADSAFE=1) -add_library(sqlite3 sqlite3_win.c) +if(WIN32) + add_library(sqlite3 STATIC sqlite3.c) +else() + add_library(sqlite3 sqlite3.c) +endif() -add_executable(sqlite3-bin shell.c) +add_executable(sqlite3-bin shell.c sqlite3.c) target_link_libraries(sqlite3-bin sqlite3) set_target_properties(sqlite3-bin PROPERTIES OUTPUT_NAME sqlite3) diff --git a/SuperBuild/patches/SQLITE/sqlite3_win.c b/SuperBuild/patches/SQLITE/sqlite3_win.c deleted file mode 100644 index 02425d11e4..0000000000 --- a/SuperBuild/patches/SQLITE/sqlite3_win.c +++ /dev/null @@ -1,5 +0,0 @@ -#if defined (WIN32) -#define SQLITE_API __declspec(dllexport) -#endif - -#include "sqlite3.c" -- GitLab From 9cf2f995883e1b7909b69547c92e16e2fb4f02c9 Mon Sep 17 00:00:00 2001 From: Thibaut ROMAIN Date: Fri, 26 Nov 2021 14:04:57 +0100 Subject: [PATCH 3/5] BUG: try version 3.27 from 2019 for sqlite --- SuperBuild/CMake/External_sqlite.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/CMake/External_sqlite.cmake b/SuperBuild/CMake/External_sqlite.cmake index eb63f9cab6..c54f3515f6 100644 --- a/SuperBuild/CMake/External_sqlite.cmake +++ b/SuperBuild/CMake/External_sqlite.cmake @@ -24,8 +24,8 @@ SETUP_SUPERBUILD(SQLITE) ExternalProject_Add(SQLITE PREFIX SQLITE - URL "https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip" - URL_MD5 c5d360c74111bafae1b704721ff18fe6 + URL "https://www.sqlite.org/2019/sqlite-amalgamation-3270000.zip" + URL_MD5 375467577c31b88f1f6bb00526ddcaf0 SOURCE_DIR ${SQLITE_SB_SRC} BINARY_DIR ${SQLITE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} -- GitLab From 187aa9df9becdaed74bc2d27149f3a792db1958c Mon Sep 17 00:00:00 2001 From: Thibaut ROMAIN Date: Fri, 26 Nov 2021 15:23:49 +0100 Subject: [PATCH 4/5] BUG: Try disabling multithread on sqlite for windows --- SuperBuild/CMake/External_sqlite.cmake | 4 ++-- SuperBuild/patches/SQLITE/CMakeLists.txt | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/SuperBuild/CMake/External_sqlite.cmake b/SuperBuild/CMake/External_sqlite.cmake index c54f3515f6..eb63f9cab6 100644 --- a/SuperBuild/CMake/External_sqlite.cmake +++ b/SuperBuild/CMake/External_sqlite.cmake @@ -24,8 +24,8 @@ SETUP_SUPERBUILD(SQLITE) ExternalProject_Add(SQLITE PREFIX SQLITE - URL "https://www.sqlite.org/2019/sqlite-amalgamation-3270000.zip" - URL_MD5 375467577c31b88f1f6bb00526ddcaf0 + URL "https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip" + URL_MD5 c5d360c74111bafae1b704721ff18fe6 SOURCE_DIR ${SQLITE_SB_SRC} BINARY_DIR ${SQLITE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} diff --git a/SuperBuild/patches/SQLITE/CMakeLists.txt b/SuperBuild/patches/SQLITE/CMakeLists.txt index 58552488ce..21afdaac14 100644 --- a/SuperBuild/patches/SQLITE/CMakeLists.txt +++ b/SuperBuild/patches/SQLITE/CMakeLists.txt @@ -18,7 +18,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.10.0) project(sqlite) @@ -28,7 +28,11 @@ include_directories("${CMAKE_SOURCE_DIR}") add_definitions(-DSQLITE_ENABLE_COLUMN_METADATA=1) add_definitions(-DSQLITE_ENABLE_RTREE=1) add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION=1) -add_definitions(-DSQLITE_THREADSAFE=1) +if(WIN32) + add_definitions(-DSQLITE_THREADSAFE=0) +else() + add_definitions(-DSQLITE_THREADSAFE=1) +endif() if(WIN32) add_library(sqlite3 STATIC sqlite3.c) -- GitLab From 0392e903c2ca9c26c5710905380455664baccd0e Mon Sep 17 00:00:00 2001 From: Thibaut ROMAIN Date: Fri, 26 Nov 2021 18:15:21 +0100 Subject: [PATCH 5/5] BUG: try minimal version of sqlite for PROJ 8 --- SuperBuild/CMake/External_sqlite.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/CMake/External_sqlite.cmake b/SuperBuild/CMake/External_sqlite.cmake index eb63f9cab6..7918d93754 100644 --- a/SuperBuild/CMake/External_sqlite.cmake +++ b/SuperBuild/CMake/External_sqlite.cmake @@ -24,8 +24,8 @@ SETUP_SUPERBUILD(SQLITE) ExternalProject_Add(SQLITE PREFIX SQLITE - URL "https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip" - URL_MD5 c5d360c74111bafae1b704721ff18fe6 + URL "https://www.sqlite.org/2016/sqlite-amalgamation-3110000.zip" + URL_MD5 ab80e70b65da455514a68441ce3e0a8c SOURCE_DIR ${SQLITE_SB_SRC} BINARY_DIR ${SQLITE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} -- GitLab