From d87d493de2579f9af43b59fc61122d6339f66871 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 21 Jun 2022 15:43:01 +0200
Subject: [PATCH] Sqlite: Only declare the defines for the sqlite files

Change-Id: Ic5a7be63c86cf3f369309fc4d21cf6f5ceefb098
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/sqlite/CMakeLists.txt                | 37 +++++++++----------
 .../sqlite/createtablesqlstatementbuilder.h   |  2 +-
 tests/unit/unittest/CMakeLists.txt            |  2 +-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index 793f57beaa4..a2bfd30e947 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -1,22 +1,26 @@
-set(SQLITE_SOURCES
-  ../3rdparty/sqlite/sqlite3.c
-  ../3rdparty/sqlite/sqlite3.h
-  ../3rdparty/sqlite/carray.c
-  ../3rdparty/sqlite/config.h
-  ../3rdparty/sqlite/sqlite.h
+add_qtc_library(SqliteC OBJECT
+    PROPERTIES AUTOMOC OFF AUTOUIC OFF QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON POSITION_INDEPENDENT_CODE ON
+    CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
+    DEFINES SQLITE_CORE SQLITE_CUSTOM_INCLUDE=config.h
+    SOURCES
+      ../3rdparty/sqlite
+      ../3rdparty/sqlite/sqlite3.c
+      ../3rdparty/sqlite/sqlite3.h
+      ../3rdparty/sqlite/sqlite3ext.h
+      ../3rdparty/sqlite/carray.c
+      ../3rdparty/sqlite/config.h
+      ../3rdparty/sqlite/sqlite.h
 )
 
 add_qtc_library(Sqlite
   PROPERTIES AUTOMOC OFF AUTOUIC OFF
-  PUBLIC_DEFINES
-      SQLITE_CORE
-  DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS}
+  DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
   CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
   PUBLIC_INCLUDES
     "${CMAKE_CURRENT_LIST_DIR}"
     ../3rdparty/sqlite
+  DEFINES SQLITE_LIBRARY SQLITE_CUSTOM_INCLUDE=config.h
   SOURCES
-    ${SQLITE_SOURCES}
     constraints.h
     createtablesqlstatementbuilder.h
     lastchangedrowid.h
@@ -46,16 +50,9 @@ add_qtc_library(Sqlite
     sqlitelibraryinitializer.cpp sqlitelibraryinitializer.h
 )
 
-set_source_files_properties(
-  ${SQLITE_SOURCES}
-  PROPERTIES
-    QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON
-)
-
-extend_qtc_library(Sqlite DEFINES SQLITE_CUSTOM_INCLUDE=config.h)
-
 if (APPLE)
-  extend_qtc_library(Sqlite DEFINES _BSD_SOURCE)
+  extend_qtc_library(SqliteC DEFINES _BSD_SOURCE)
 elseif (UNIX)
-  extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
+  extend_qtc_library(SqliteC DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
 endif()
+
diff --git a/src/libs/sqlite/createtablesqlstatementbuilder.h b/src/libs/sqlite/createtablesqlstatementbuilder.h
index fb53e68a426..1f8160d10b8 100644
--- a/src/libs/sqlite/createtablesqlstatementbuilder.h
+++ b/src/libs/sqlite/createtablesqlstatementbuilder.h
@@ -34,7 +34,7 @@
 namespace Sqlite {
 
 template<typename ColumnType>
-class SQLITE_EXPORT CreateTableSqlStatementBuilder
+class CreateTableSqlStatementBuilder
 {
 public:
     CreateTableSqlStatementBuilder()
diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index d10c7513344..366942bc3eb 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -24,7 +24,7 @@ add_qtc_test(unittest GTEST
   DEPENDS
     Qt5::Core Qt5::Network Qt5::Widgets
     Qt5::Xml Qt5::Concurrent Qt5::Qml Qt5::Gui
-    Qt6Core5Compat QmlJS Sqlite
+    Qt6Core5Compat QmlJS Sqlite SqliteC
     Googletest
   CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
   DEFINES