CMake build: Build fix for "Enable macro editing for the Clang indexer"

Change-Id: I69396e306d1b8646fa4388681a8705937bf9423f
Reviewed-by: hjk <hjk@qt.io>

3 files changed, 13 insertions, 0 deletions

diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 127a41960f..94de075b67 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -43,8 +43,14 @@ add_qtc_library(Utils
     elfreader.cpp elfreader.h
     elidinglabel.cpp elidinglabel.h
     environment.cpp environment.h
+    environmentfwd.h
     environmentdialog.cpp environmentdialog.h
     environmentmodel.cpp environmentmodel.h
+    namevaluedictionary.cpp namevaluedictionary.h
+    namevalueitem.cpp namevalueitem.h
+    namevaluemodel.cpp namevaluemodel.h
+    namevaluesdialog.cpp namevaluesdialog.h
+    namevaluevalidator.cpp namevaluevalidator.h
     execmenu.cpp execmenu.h
     executeondestruction.h
     fadingindicator.cpp fadingindicator.h
diff --git a/src/tools/sdktool/CMakeLists.txt b/src/tools/sdktool/CMakeLists.txt
index 3997c9763c..b238ab2af8 100644
--- a/src/tools/sdktool/CMakeLists.txt
+++ b/src/tools/sdktool/CMakeLists.txt
@@ -35,6 +35,8 @@ extend_qtc_target(sdktool
     environment.cpp environment.h
     fileutils.cpp fileutils.h
     hostosinfo.cpp hostosinfo.h
+    namevaluedictionary.cpp namevaluedictionary.h
+    namevalueitem.cpp namevalueitem.h
     persistentsettings.cpp persistentsettings.h
     qtcassert.cpp qtcassert.h
     qtcprocess.cpp qtcprocess.h
diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index 0aed2a8995..7e57093cea 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -30,6 +30,7 @@ add_qtc_test(unittest GTEST
     builddependenciesprovider-test.cpp
     builddependenciesstorage-test.cpp
     changedfilepathcompressor-test.cpp
+    clangindexingsettingsmanager-test.cpp
     clangpathwatcher-test.cpp
     clangqueryexamplehighlightmarker-test.cpp
     clangqueryhighlightmarker-test.cpp
@@ -125,6 +126,7 @@ add_qtc_test(unittest GTEST
     pchtaskqueue-test.cpp
     pchtasksmerger-test.cpp
     precompiledheaderstorage-test.cpp
+    preprocessormacrocollector-test.cpp
     processcreator-test.cpp
     processevents-utilities.cpp processevents-utilities.h
     processormanager-test.cpp
@@ -393,10 +395,13 @@ extend_qtc_target(unittest
   SOURCES_PREFIX "${ClangPchManagerSourcesDir}"
   DEFINES CLANGPCHMANAGER_STATIC_LIB
   SOURCES
+    clangindexingprojectsettings.cpp clangindexingprojectsettings.h
+    clangindexingsettingsmanager.cpp clangindexingsettingsmanager.h
     pchmanagerclient.h pchmanagerclient.cpp
     pchmanagernotifierinterface.h pchmanagernotifierinterface.cpp
     pchmanagerconnectionclient.h pchmanagerconnectionclient.cpp
     clangpchmanager_global.h
+    preprocessormacrocollector.cpp preprocessormacrocollector.h
     projectupdater.h projectupdater.cpp
     pchmanagerprojectupdater.h pchmanagerprojectupdater.cpp
     progressmanager.h