feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
7b330d3496c3c2083ee4fa212a3413f0b139f983
qt-creator/src/libs/sqlite/CMakeLists.txt

53 lines
1.5 KiB
CMake
Raw Normal View History

Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
add_qtc_library(Sqlite
sqlite: make defines public Change-Id: I44d1636cdb7f1dce9a3b25fe8f5e9f11f5364cdb Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-06-08 12:10:08 +02:00
PUBLIC_DEFINES
sqlite: fix qbs and cmake builds Change-Id: I64887c2dd11b8de8627976b148993467e70674e0 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-06-05 17:19:29 +02:00
BUILD_SQLITE_LIBRARY
Revert "Revert "Merge remote-tracking branch 'origin/4.15'"" This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb. Reverting a merge doesn't "undo" it - the changes would be lost forever even with subsequent merges. So we need to revert the revert to get the changes. Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-07 09:19:39 +02:00
SQLITE_CORE
Fix CMake build by adding missing library dependencies This patch fixes the following compile errors when using CMake: lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'dlerror' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'pthread_join' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'pthread_mutexattr_settype' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'pthread_mutexattr_init' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'dlopen' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'dlsym' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'dlclose' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'pthread_mutex_trylock' lib/qtcreator/libSqlite.so.4.10.82: error: undefined reference to 'pthread_mutexattr_destroy' lib/qtcreator/libClangSupport.so.4.10.82: error: undefined reference to 'pthread_create' Change-Id: I7bf4a9f173622c36ac3ea0c7bde5a0999e9b0edf Reviewed-by: Tim Henning <tim.henning@kdab.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-08-29 15:53:14 +02:00
DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS}
CMake build: export less generic public includes Do not put every plugin's and lib's source folder into public includes. We require includes of the style <somelib/foo.h> and <someplugin/bar.h> if someone depends on somelib or someplugin. Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-23 11:00:30 +02:00
PUBLIC_INCLUDES
"${CMAKE_CURRENT_LIST_DIR}"
CMake: build fix for unittests Change-Id: I1ead13e7b764a346ac49004ead2bf9ab6362ffb5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-27 23:24:53 +02:00
../3rdparty/sqlite
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
SOURCES
../3rdparty/sqlite/sqlite3.c
CMake build: Fix issues with exported targets Remove unneeded and wrong include paths which ended up as invalid include paths in the exported QtCreatorTargets.cmake. Add missing sqlite header. Change-Id: Icce60037160ff06b032a03df47e6834422f86f57 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-02 16:36:45 +02:00
../3rdparty/sqlite/sqlite3.h
Sqlite: Fix CMakeLists.txt Change-Id: I53d862aabe76f2b5edefb8e365af8ab73f4994f5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-28 11:13:54 +02:00
../3rdparty/sqlite/carray.c
Revert "Revert "Merge remote-tracking branch 'origin/4.15'"" This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb. Reverting a merge doesn't "undo" it - the changes would be lost forever even with subsequent merges. So we need to revert the revert to get the changes. Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-07 09:19:39 +02:00
../3rdparty/sqlite/config.h
../3rdparty/sqlite/sqlite.h
Sqlite: Fix CMakeLists.txt Change-Id: I53d862aabe76f2b5edefb8e365af8ab73f4994f5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-28 11:13:54 +02:00
constraints.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
createtablesqlstatementbuilder.cpp createtablesqlstatementbuilder.h
Sqlite: Fix CMakeLists.txt Change-Id: I53d862aabe76f2b5edefb8e365af8ab73f4994f5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-28 11:13:54 +02:00
lastchangedrowid.h
Sqlite: Add insertUpdateRemove An generic approach to merge values into a database. It is comparing two ranges. The first range is the Sqlite select range and the second one which are the new values. New values are inserted, change are updated and missing values are removed. Unchanged values are not touched. The compare function is comparing a key. Both ranges are binary ordered. Change-Id: I973c83677ea74f8fa62bd7ab8a73ed560c806562 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-18 12:14:16 +02:00
sqlitealgorithms.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
sqlitebasestatement.cpp sqlitebasestatement.h
Sqlite: Delete empty sources Change-Id: Iae592bc22e4781148ec1be7a3ca5746719817f1e Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-05-26 21:21:19 +03:00
sqlitecolumn.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
sqlitedatabase.cpp sqlitedatabase.h
sqlitedatabasebackend.cpp sqlitedatabasebackend.h
CMake build: Fix issues with exported targets Remove unneeded and wrong include paths which ended up as invalid include paths in the exported QtCreatorTargets.cmake. Add missing sqlite header. Change-Id: Icce60037160ff06b032a03df47e6834422f86f57 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-02 16:36:45 +02:00
sqlitedatabaseinterface.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
sqliteexception.cpp sqliteexception.h
sqliteglobal.cpp sqliteglobal.h
sqliteindex.h
Sqlite: Move result count to class declaration It move the magic number of column results to the sql statement and improves the mock a little bit. Change-Id: I101067444cf27ec5dea0c72de7fd484a7e8710f0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-24 18:10:55 +01:00
sqlitereadstatement.h
sqlitereadwritestatement.h
sqlite: fix qbs and cmake builds Change-Id: I64887c2dd11b8de8627976b148993467e70674e0 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-06-05 17:19:29 +02:00
sqlitesessionchangeset.cpp sqlitesessionchangeset.h
sqlitesessions.cpp sqlitesessions.h
Sqlite: Delete empty sources Change-Id: Iae592bc22e4781148ec1be7a3ca5746719817f1e Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-05-26 21:21:19 +03:00
sqlitetable.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
sqlitetransaction.h
CMake build: Fix issues with exported targets Remove unneeded and wrong include paths which ended up as invalid include paths in the exported QtCreatorTargets.cmake. Add missing sqlite header. Change-Id: Icce60037160ff06b032a03df47e6834422f86f57 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-02 16:36:45 +02:00
sqlitetransaction.h
Sqlite: Add Sqlite::Value It adds a layer if you don't know if the type is integer, float or string. It does not handle bytearrays here because so far there is no need. There are two classes, Sqlite::Value and Sqlite::ValueView. Value owns the string, ValueView holds only a view the string. So there is no allocation. It is designed to hold Utf-8 string like Sqlite but it can be easily converted in and from QString or QVariant but mind about that this is not free. ValueView has no constructors on perpose because it would be ambiguous if there would be constructors for the other primitives of the Sqlite layer like "int64", "double" and "string view". Change-Id: Ia39364eb2fc1998e5c59fdb4316add22c748507d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 20:01:38 +02:00
sqlitevalue.h
Sqlite: Move result count to class declaration It move the magic number of column results to the sql statement and improves the mock a little bit. Change-Id: I101067444cf27ec5dea0c72de7fd484a7e8710f0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-24 18:10:55 +01:00
sqlitewritestatement.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
sqlstatementbuilder.cpp sqlstatementbuilder.h
Sqlite: Delete empty sources Change-Id: Iae592bc22e4781148ec1be7a3ca5746719817f1e Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-05-26 21:21:19 +03:00
sqlstatementbuilderexception.h
CMake build: Fix issues with exported targets Remove unneeded and wrong include paths which ended up as invalid include paths in the exported QtCreatorTargets.cmake. Add missing sqlite header. Change-Id: Icce60037160ff06b032a03df47e6834422f86f57 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-02 16:36:45 +02:00
tableconstraints.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
utf8string.cpp utf8string.h
utf8stringvector.cpp utf8stringvector.h
QmlDesigner: Add image cache The image cache is saving images and icon of this images in a sqlite database. If there are no images they are generated in the backgound. The icons are fetched by item library. Task-number: QDS-2782 Task-number: QDS-2783 Task-number: QDS-2858 Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-09-16 13:44:43 +02:00
sqliteblob.h
sqlitetimestamp.h
Revert "Revert "Merge remote-tracking branch 'origin/4.15'"" This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb. Reverting a merge doesn't "undo" it - the changes would be lost forever even with subsequent merges. So we need to revert the revert to get the changes. Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-07 09:19:39 +02:00
sqlitelibraryinitializer.cpp sqlitelibraryinitializer.h
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
)
Revert "Revert "Merge remote-tracking branch 'origin/4.15'"" This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb. Reverting a merge doesn't "undo" it - the changes would be lost forever even with subsequent merges. So we need to revert the revert to get the changes. Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-07 09:19:39 +02:00
extend_qtc_library(Sqlite DEFINES _HAVE_SQLITE_CONFIG_H)
if (APPLE)
extend_qtc_library(Sqlite DEFINES _BSD_SOURCE)
elseif (UNIX)
extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
endif()
Copy Permalink