feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sqlite: Only declare the defines for the sqlite files

Browse Source 
Change-Id: Ic5a7be63c86cf3f369309fc4d21cf6f5ceefb098
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2022-06-21 15:43:01 +02:00
parent f7fee5e023
commit d87d493de2
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/libs/sqlite/CMakeLists.txt
View File

@@ -1,22 +1,26 @@
set(SQLITE_SOURCES add_qtc_library(SqliteC OBJECT
../3rdparty/sqlite/sqlite3.c PROPERTIES AUTOMOC OFF AUTOUIC OFF QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON POSITION_INDEPENDENT_CODE ON
../3rdparty/sqlite/sqlite3.h CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
../3rdparty/sqlite/carray.c DEFINES SQLITE_CORE SQLITE_CUSTOM_INCLUDE=config.h
../3rdparty/sqlite/config.h SOURCES
../3rdparty/sqlite/sqlite.h ../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 add_qtc_library(Sqlite
PROPERTIES AUTOMOC OFF AUTOUIC OFF PROPERTIES AUTOMOC OFF AUTOUIC OFF
PUBLIC_DEFINES DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
SQLITE_CORE
DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS}
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
PUBLIC_INCLUDES PUBLIC_INCLUDES
"${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_CURRENT_LIST_DIR}"
../3rdparty/sqlite ../3rdparty/sqlite
DEFINES SQLITE_LIBRARY SQLITE_CUSTOM_INCLUDE=config.h
SOURCES SOURCES
${SQLITE_SOURCES}
constraints.h constraints.h
createtablesqlstatementbuilder.h createtablesqlstatementbuilder.h
lastchangedrowid.h lastchangedrowid.h
@@ -46,16 +50,9 @@ add_qtc_library(Sqlite
sqlitelibraryinitializer.cpp sqlitelibraryinitializer.h 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) if (APPLE)
extend_qtc_library(Sqlite DEFINES _BSD_SOURCE) extend_qtc_library(SqliteC DEFINES _BSD_SOURCE)
elseif (UNIX) 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() endif()

2
src/libs/sqlite/createtablesqlstatementbuilder.h
View File

@@ -34,7 +34,7 @@
namespace Sqlite { namespace Sqlite {
template<typename ColumnType> template<typename ColumnType>
class SQLITE_EXPORT CreateTableSqlStatementBuilder class CreateTableSqlStatementBuilder
{ {
public: public:
CreateTableSqlStatementBuilder() CreateTableSqlStatementBuilder()

2
tests/unit/unittest/CMakeLists.txt
View File

@@ -24,7 +24,7 @@ add_qtc_test(unittest GTEST
DEPENDS DEPENDS
Qt5::Core Qt5::Network Qt5::Widgets Qt5::Core Qt5::Network Qt5::Widgets
Qt5::Xml Qt5::Concurrent Qt5::Qml Qt5::Gui Qt5::Xml Qt5::Concurrent Qt5::Qml Qt5::Gui
Qt6Core5Compat QmlJS Sqlite Qt6Core5Compat QmlJS Sqlite SqliteC
Googletest Googletest
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
DEFINES DEFINES