From 7c93f25ae90bb3b4019664c3c5a8f62e7caec50c Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 2 Oct 2020 16:36:45 +0200
Subject: [PATCH] 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>
---
 src/libs/3rdparty/cplusplus/CMakeLists.txt | 1 -
 src/libs/cplusplus/CMakeLists.txt          | 1 -
 src/libs/sqlite/CMakeLists.txt             | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libs/3rdparty/cplusplus/CMakeLists.txt b/src/libs/3rdparty/cplusplus/CMakeLists.txt
index 11ba09cab62..b8a8607a8c3 100644
--- a/src/libs/3rdparty/cplusplus/CMakeLists.txt
+++ b/src/libs/3rdparty/cplusplus/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_qtc_library(3rd_cplusplus OBJECT
   PUBLIC_DEPENDS Qt5::Core Utils
   DEFINES CPLUSPLUS_BUILD_LIB
-  INCLUDES "${PROJECT_SOURCE_DIR}/src/libs"
   SOURCES
     AST.cpp AST.h
     ASTClone.cpp
diff --git a/src/libs/cplusplus/CMakeLists.txt b/src/libs/cplusplus/CMakeLists.txt
index 829534acd40..9ca49291d4c 100644
--- a/src/libs/cplusplus/CMakeLists.txt
+++ b/src/libs/cplusplus/CMakeLists.txt
@@ -6,7 +6,6 @@ add_qtc_library(CPlusPlus
   DEPENDS Utils Qt5::Concurrent
   DEFINES CPLUSPLUS_BUILD_LIB
   PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui
-  PUBLIC_INCLUDES src/libs/3rdparty
   SOURCES
     ASTParent.cpp ASTParent.h
     ASTPath.cpp ASTPath.h
diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index 33abce755f8..30e5edf12fc 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -17,6 +17,7 @@ add_qtc_library(Sqlite
     ../3rdparty/sqlite
   SOURCES
     ../3rdparty/sqlite/sqlite3.c
+    ../3rdparty/sqlite/sqlite3.h
     ../3rdparty/sqlite/carray.c
     constraints.h
     createtablesqlstatementbuilder.cpp createtablesqlstatementbuilder.h
@@ -25,6 +26,7 @@ add_qtc_library(Sqlite
     sqlitecolumn.h
     sqlitedatabase.cpp sqlitedatabase.h
     sqlitedatabasebackend.cpp sqlitedatabasebackend.h
+    sqlitedatabaseinterface.h
     sqliteexception.cpp sqliteexception.h
     sqliteglobal.cpp sqliteglobal.h
     sqliteindex.h
@@ -34,10 +36,12 @@ add_qtc_library(Sqlite
     sqlitesessions.cpp sqlitesessions.h
     sqlitetable.h
     sqlitetransaction.h
-    sqlitewritestatement.cpp sqlitewritestatement.h
+    sqlitetransaction.h
     sqlitevalue.h
+    sqlitewritestatement.cpp sqlitewritestatement.h
     sqlstatementbuilder.cpp sqlstatementbuilder.h
     sqlstatementbuilderexception.h
+    tableconstraints.h
     utf8string.cpp utf8string.h
     utf8stringvector.cpp utf8stringvector.h
 )