diff options
author | Cristian Adam <cristian.adam@gmail.com> | 2019-06-03 13:23:10 +0200 |
---|---|---|
committer | Cristian Adam <cristian.adam@qt.io> | 2019-06-03 11:49:13 +0000 |
commit | dfe38f79c3aa7a1ebcf4d90792bc2a297d1b6dfa (patch) | |
tree | a9a74c476808122f84ddef974d9442588318884a /src/plugins/coreplugin | |
parent | d1fef0ea517a163003a26edd8ba89b33f05d64dc (diff) | |
download | qt-creator-dfe38f79c3aa7a1ebcf4d90792bc2a297d1b6dfa.tar.gz |
CMake build: Ensure compilation when Qt5::Script is missing
The Qt5 Visual C++ 2017 64 bit installation doesn't come with Qt5::Script
target by default.
This patch ensures that Qt Creator can be built with the above Qt5 scenario.
Change-Id: Ibe35e9d879ccd51012f53acebfbb7461fd773d4a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r-- | src/plugins/coreplugin/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index 5018a9b4c1..7783685969 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(Core - DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Script Qt5::Sql Qt5::Gui Qt5::GuiPrivate + DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Sql Qt5::Gui Qt5::GuiPrivate PUBLIC_DEPENDS Aggregation ExtensionSystem Utils app_version SOURCES actionmanager/actioncontainer.cpp actionmanager/actioncontainer.h actionmanager/actioncontainer_p.h @@ -100,7 +100,6 @@ add_qtc_plugin(Core locator/externaltoolsfilter.cpp locator/externaltoolsfilter.h locator/filesystemfilter.cpp locator/filesystemfilter.h locator/filesystemfilter.ui locator/ilocatorfilter.cpp locator/ilocatorfilter.h - locator/javascriptfilter.cpp locator/javascriptfilter.h locator/locator.cpp locator/locator.h locator/locatorconstants.h locator/locatorfiltersfilter.cpp locator/locatorfiltersfilter.h @@ -176,3 +175,11 @@ extend_qtc_plugin(Core CONDITION (NOT WIN32) AND (NOT APPLE) SOURCES progressmanager/progressmanager_x11.cpp ) + +extend_qtc_plugin(Core + CONDITION TARGET Qt5::Script + DEPENDS Qt5::Script + DEFINES WITH_JAVASCRIPTFILTER + SOURCES + locator/javascriptfilter.cpp locator/javascriptfilter.h +) |