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

CMake build: Ensure compilation when Qt5::Script is missing

Browse Source 
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>
This commit is contained in:
Cristian Adam
2019-06-03 13:23:10 +02:00
committed by Cristian Adam
parent d1fef0ea51
commit dfe38f79c3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -50,7 +50,7 @@ endif()
find_package(Qt5 find_package(Qt5
COMPONENTS Concurrent Core Network PrintSupport Qml Quick QuickWidgets COMPONENTS Concurrent Core Network PrintSupport Qml Quick QuickWidgets
Script Sql ${_TEST_QT_COMPONENT} Sql ${_TEST_QT_COMPONENT}
REQUIRED REQUIRED
) )
@@ -90,7 +90,7 @@ endfunction()
qt5_query_qmake() qt5_query_qmake()
find_package(Qt5 COMPONENTS Designer Help SerialPort Svg QUIET) find_package(Qt5 COMPONENTS Designer Help Script SerialPort Svg QUIET)
function (set_if_target var target) function (set_if_target var target)
if (TARGET "${target}") if (TARGET "${target}")
set(_result ON) set(_result ON)

11
src/plugins/coreplugin/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Core 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 PUBLIC_DEPENDS Aggregation ExtensionSystem Utils app_version
SOURCES SOURCES
actionmanager/actioncontainer.cpp actionmanager/actioncontainer.h actionmanager/actioncontainer_p.h 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/externaltoolsfilter.cpp locator/externaltoolsfilter.h
locator/filesystemfilter.cpp locator/filesystemfilter.h locator/filesystemfilter.ui locator/filesystemfilter.cpp locator/filesystemfilter.h locator/filesystemfilter.ui
locator/ilocatorfilter.cpp locator/ilocatorfilter.h locator/ilocatorfilter.cpp locator/ilocatorfilter.h
locator/javascriptfilter.cpp locator/javascriptfilter.h
locator/locator.cpp locator/locator.h locator/locator.cpp locator/locator.h
locator/locatorconstants.h locator/locatorconstants.h
locator/locatorfiltersfilter.cpp locator/locatorfiltersfilter.h locator/locatorfiltersfilter.cpp locator/locatorfiltersfilter.h
@@ -176,3 +175,11 @@ extend_qtc_plugin(Core
CONDITION (NOT WIN32) AND (NOT APPLE) CONDITION (NOT WIN32) AND (NOT APPLE)
SOURCES progressmanager/progressmanager_x11.cpp 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
)