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

CMake build: Fix issues with exported targets

Browse Source 
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>
This commit is contained in:
Eike Ziller
2020-10-02 16:36:45 +02:00
parent 735078cd80
commit 7c93f25ae9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/3rdparty/cplusplus/CMakeLists.txt vendored
View File

@@ -1,7 +1,6 @@
add_qtc_library(3rd_cplusplus OBJECT add_qtc_library(3rd_cplusplus OBJECT
PUBLIC_DEPENDS Qt5::Core Utils PUBLIC_DEPENDS Qt5::Core Utils
DEFINES CPLUSPLUS_BUILD_LIB DEFINES CPLUSPLUS_BUILD_LIB
INCLUDES "${PROJECT_SOURCE_DIR}/src/libs"
SOURCES SOURCES
AST.cpp AST.h AST.cpp AST.h
ASTClone.cpp ASTClone.cpp

1
src/libs/cplusplus/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ add_qtc_library(CPlusPlus
DEPENDS Utils Qt5::Concurrent DEPENDS Utils Qt5::Concurrent
DEFINES CPLUSPLUS_BUILD_LIB DEFINES CPLUSPLUS_BUILD_LIB
PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui
PUBLIC_INCLUDES src/libs/3rdparty
SOURCES SOURCES
ASTParent.cpp ASTParent.h ASTParent.cpp ASTParent.h
ASTPath.cpp ASTPath.h ASTPath.cpp ASTPath.h

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

@@ -17,6 +17,7 @@ add_qtc_library(Sqlite
../3rdparty/sqlite ../3rdparty/sqlite
SOURCES SOURCES
../3rdparty/sqlite/sqlite3.c ../3rdparty/sqlite/sqlite3.c
../3rdparty/sqlite/sqlite3.h
../3rdparty/sqlite/carray.c ../3rdparty/sqlite/carray.c
constraints.h constraints.h
createtablesqlstatementbuilder.cpp createtablesqlstatementbuilder.h createtablesqlstatementbuilder.cpp createtablesqlstatementbuilder.h
@@ -25,6 +26,7 @@ add_qtc_library(Sqlite
sqlitecolumn.h sqlitecolumn.h
sqlitedatabase.cpp sqlitedatabase.h sqlitedatabase.cpp sqlitedatabase.h
sqlitedatabasebackend.cpp sqlitedatabasebackend.h sqlitedatabasebackend.cpp sqlitedatabasebackend.h
sqlitedatabaseinterface.h
sqliteexception.cpp sqliteexception.h sqliteexception.cpp sqliteexception.h
sqliteglobal.cpp sqliteglobal.h sqliteglobal.cpp sqliteglobal.h
sqliteindex.h sqliteindex.h
@@ -34,10 +36,12 @@ add_qtc_library(Sqlite
sqlitesessions.cpp sqlitesessions.h sqlitesessions.cpp sqlitesessions.h
sqlitetable.h sqlitetable.h
sqlitetransaction.h sqlitetransaction.h
sqlitewritestatement.cpp sqlitewritestatement.h sqlitetransaction.h
sqlitevalue.h sqlitevalue.h
sqlitewritestatement.cpp sqlitewritestatement.h
sqlstatementbuilder.cpp sqlstatementbuilder.h sqlstatementbuilder.cpp sqlstatementbuilder.h
sqlstatementbuilderexception.h sqlstatementbuilderexception.h
tableconstraints.h
utf8string.cpp utf8string.h utf8string.cpp utf8string.h
utf8stringvector.cpp utf8stringvector.h utf8stringvector.cpp utf8stringvector.h
) )