Merge remote-tracking branch 'origin/4.10'

Change-Id: I427280fdb207b878000697dfd37595ffdb26f4e7

6 files changed, 3 insertions, 6 deletions

diff --git a/src/libs/3rdparty/cplusplus/CMakeLists.txt b/src/libs/3rdparty/cplusplus/CMakeLists.txt
index a33e96a197..11ba09cab6 100644
--- a/src/libs/3rdparty/cplusplus/CMakeLists.txt
+++ b/src/libs/3rdparty/cplusplus/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_qtc_library(3rd_cplusplus OBJECT
   PUBLIC_DEPENDS Qt5::Core Utils
   DEFINES CPLUSPLUS_BUILD_LIB
-  INCLUDES "${CMAKE_SOURCE_DIR}/src/libs"
+  INCLUDES "${PROJECT_SOURCE_DIR}/src/libs"
   SOURCES
     AST.cpp AST.h
     ASTClone.cpp
diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt
index b3c20f3062..5357bd34c4 100644
--- a/src/libs/clangsupport/CMakeLists.txt
+++ b/src/libs/clangsupport/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_qtc_library(ClangSupport
   PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network
-  PUBLIC_INCLUDES "${CMAKE_CURRENT_LIST_DIR}"
   PUBLIC_DEFINES
     CLANG_VERSION="${CLANG_VERSION}"
     CLANG_RESOURCE_DIR="${CLANG_RESOURCE_DIR}"
diff --git a/src/libs/cplusplus/CMakeLists.txt b/src/libs/cplusplus/CMakeLists.txt
index 593d809394..afeec6c7e7 100644
--- a/src/libs/cplusplus/CMakeLists.txt
+++ b/src/libs/cplusplus/CMakeLists.txt
@@ -6,7 +6,7 @@ add_qtc_library(CPlusPlus
   DEPENDS Utils
   DEFINES CPLUSPLUS_BUILD_LIB
   PUBLIC_DEPENDS 3rd_cplusplus Qt5::Concurrent Qt5::Gui
-  PUBLIC_INCLUDES "${CMAKE_SOURCE_DIR}/src/libs/3rdparty"
+  PUBLIC_INCLUDES src/libs/3rdparty
   SOURCES
     ASTParent.cpp ASTParent.h
     ASTPath.cpp ASTPath.h
diff --git a/src/libs/modelinglib/CMakeLists.txt b/src/libs/modelinglib/CMakeLists.txt
index 7b09c932e4..55c6e3a951 100644
--- a/src/libs/modelinglib/CMakeLists.txt
+++ b/src/libs/modelinglib/CMakeLists.txt
@@ -3,7 +3,6 @@ add_qtc_library(Modeling
   DEPENDS Qt5::Widgets Utils
   PUBLIC_DEPENDS OptionalSvg
   INCLUDES qtserialization/inc
-  PUBLIC_INCLUDES "${CMAKE_CURRENT_LIST_DIR}"
   SOURCES
     qmt/config/configcontroller.cpp qmt/config/configcontroller.h
     qmt/config/sourcepos.cpp qmt/config/sourcepos.h
diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index 22ba4bac34..48eda5cf92 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -4,7 +4,7 @@ add_qtc_library(Sqlite
     SQLITE_ENABLE_UNLOCK_NOTIFY SQLITE_ENABLE_COLUMN_METADATA
     BUILD_SQLITE_LIBRARY
   DEPENDS Qt5::Core
-  PUBLIC_INCLUDES "${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_CURRENT_LIST_DIR}/../3rdparty/sqlite"
+  PUBLIC_INCLUDES ../3rdparty/sqlite
   SOURCES
     ../3rdparty/sqlite/sqlite3.c
     createtablesqlstatementbuilder.cpp createtablesqlstatementbuilder.h
diff --git a/src/libs/tracing/CMakeLists.txt b/src/libs/tracing/CMakeLists.txt
index 153756323e..41a42bbac5 100644
--- a/src/libs/tracing/CMakeLists.txt
+++ b/src/libs/tracing/CMakeLists.txt
@@ -6,7 +6,6 @@ endif()
 
 add_qtc_library(Tracing
   DEPENDS Utils Qt5::Qml Qt5::Quick
-  PUBLIC_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}"
   SOURCES ${TEST_SOURCES}
     flamegraph.cpp flamegraph.h
     flamegraphattached.h