diff options
23 files changed, 667 insertions, 549 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be56ed0bd0..a889baa369 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,6 +62,31 @@ function(set_explicit_moc target_name file) target_sources(${target_name} PRIVATE "${file_moc}") endfunction() +function(add_qtc_depends target_name) + cmake_parse_arguments(_arg "" "" "PRIVATE;PUBLIC" ${ARGN}) + if (${_arg_UNPARSED_ARGUMENTS}) + message(FATAL_ERROR "add_qtc_depends had unparsed arguments") + endif() + + separate_object_libraries("${_arg_PRIVATE}" + depends object_lib_depends object_lib_depends_objects) + separate_object_libraries("${_arg_PUBLIC}" + public_depends object_public_depends object_public_depends_objects) + + target_sources(${target_name} PRIVATE ${object_lib_depends_objects} ${object_public_depends_objects}) + target_link_libraries(${target_name} PRIVATE ${depends} PUBLIC ${public_depends}) + + foreach(obj_lib IN LISTS object_lib_depends) + target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>) + target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>) + endforeach() + foreach(obj_lib IN LISTS object_public_depends) + target_compile_definitions(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>) + target_include_directories(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>) + endforeach() + +endfunction() + function(add_qtc_library name) cmake_parse_arguments(_arg "STATIC;OBJECT" "" "DEFINES;DEPENDS;INCLUDES;PUBLIC_DEFINES;PUBLIC_DEPENDS;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;PROPERTIES" ${ARGN} @@ -179,6 +204,11 @@ function(find_dependent_plugins varName) set("${varName}" ${_RESULT} PARENT_SCOPE) endfunction() +function(qtc_plugin_enabled varName name) + string(TOUPPER "BUILD_PLUGIN_${name}" _build_plugin_var) + set(${varName} ${${_build_plugin_var}} PARENT_SCOPE) +endfunction() + function(add_qtc_plugin target_name) cmake_parse_arguments(_arg "EXPERIMENTAL;SKIP_DEBUG_CMAKE_FILE_CHECK" @@ -204,7 +234,10 @@ function(add_qtc_plugin target_name) set(_extra_text "with CONDITION ${_contents}") endif() - if (${_arg_CONDITION}) + string(TOUPPER "BUILD_PLUGIN_${target_name}" _build_plugin_var) + set(${_build_plugin_var} "ON" CACHE BOOL "Build plugin ${name}.") + + if ((${_arg_CONDITION}) AND ${_build_plugin_var}) set(_plugin_enabled ON) else() set(_plugin_enabled OFF) @@ -273,13 +306,7 @@ function(add_qtc_plugin target_name) configure_file("${CMAKE_CURRENT_BINARY_DIR}/${name}.json.cmakein" "${name}.json") endif() - separate_object_libraries("${_arg_DEPENDS}" - depends object_lib_depends object_lib_depends_objects) - separate_object_libraries("${_arg_PUBLIC_DEPENDS}" - public_depends object_public_depends object_public_depends_objects) - - add_library(${target_name} SHARED ${_arg_SOURCES} - ${object_lib_depends_objects} ${object_public_depends_objects}) + add_library(${target_name} SHARED ${_arg_SOURCES}) ### Generate EXPORT_SYMBOL string(TOUPPER "${name}_LIBRARY" EXPORT_SYMBOL) @@ -288,10 +315,7 @@ function(add_qtc_plugin target_name) set(TEST_DEFINES WITH_TESTS SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") endif() - target_link_libraries(${target_name} - PRIVATE ${_DEP_PLUGINS} ${depends} ${_TEST_DEPENDS} - PUBLIC ${public_depends} - ) + target_link_libraries(${target_name} PRIVATE ${_DEP_PLUGINS} ${_TEST_DEPENDS}) target_include_directories(${target_name} PRIVATE ${_arg_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/.." "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}/src" @@ -301,14 +325,10 @@ function(add_qtc_plugin target_name) PRIVATE ${EXPORT_SYMBOL} ${DEFAULT_DEFINES} ${_arg_DEFINES} ${TEST_DEFINES} ) - foreach(obj_lib IN LISTS object_lib_depends) - target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>) - target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>) - endforeach() - foreach(obj_lib IN LISTS object_public_depends) - target_compile_definitions(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>) - target_include_directories(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>) - endforeach() + add_qtc_depends(${target_name} + PRIVATE ${_arg_DEPENDS} + PUBLIC ${_arg_PUBLIC_DEPENDS} + ) set(plugin_dir "${IDE_PLUGIN_PATH}") if (_arg_PLUGIN_PATH) @@ -340,6 +360,44 @@ function(add_qtc_plugin target_name) ) endfunction() +function(extend_qtc_plugin target_name) + cmake_parse_arguments(_arg + "" + "SOURCES_PREFIX" + "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC" + ${ARGN} + ) + + if (${_arg_UNPARSED_ARGUMENTS}) + message(FATAL_ERROR "extend_qtc_plugin had unparsed arguments") + endif() + + qtc_plugin_enabled(_plugin_enabled ${target_name}) + if (NOT _arg_CONDITION) + set(_arg_CONDITION ON) + endif() + if ((NOT (${_arg_CONDITION})) OR (NOT _plugin_enabled)) + return() + endif() + + add_qtc_depends(${target_name} + PRIVATE ${_arg_DEPENDS} + PUBLIC ${_arg_PUBLIC_DEPENDS} + ) + target_compile_definitions(${target_name} PRIVATE ${_arg_DEFINES}) + target_include_directories(${target_name} PRIVATE ${_arg_INCLUDES} PUBLIC ${_arg_PUBLIC_INCLUDES}) + + if (_arg_SOURCES_PREFIX) + list(TRANSFORM _arg_SOURCES PREPEND "${_arg_SOURCES_PREFIX}/") + target_include_directories(${target_name} PUBLIC "${_arg_SOURCES_PREFIX}") + endif() + target_sources(${target_name} PRIVATE ${_arg_SOURCES}) + + foreach(file IN LISTS _arg_EXPLICIT_MOC) + set_explicit_moc(${target_name} "${file}") + endforeach() +endfunction() + function(add_qtc_executable name) cmake_parse_arguments(_arg "" "DESTINATION" "DEFINES;DEPENDS;INCLUDES;SOURCES;PROPERTIES" ${ARGN}) diff --git a/src/plugins/autotest/CMakeLists.txt b/src/plugins/autotest/CMakeLists.txt index 9ab1e3ab7a..a5291ce315 100644 --- a/src/plugins/autotest/CMakeLists.txt +++ b/src/plugins/autotest/CMakeLists.txt @@ -74,8 +74,7 @@ add_qtc_plugin(AutoTest EXPLICIT_MOC boost/boosttestsettingspage.h ) -if (WITH_TESTS) - target_sources(AutoTest PRIVATE - autotestunittests.cpp autotestunittests.h - ) -endif() +extend_qtc_plugin(AutoTest + CONDITION WITH_TESTS + SOURCES autotestunittests.cpp autotestunittests.h +) diff --git a/src/plugins/clangcodemodel/CMakeLists.txt b/src/plugins/clangcodemodel/CMakeLists.txt index 0dc6bfa7f4..56ee68416d 100644 --- a/src/plugins/clangcodemodel/CMakeLists.txt +++ b/src/plugins/clangcodemodel/CMakeLists.txt @@ -47,11 +47,11 @@ add_qtc_plugin(ClangCodeModel EXPLICIT_MOC clangcodemodelplugin.h ) -if (WITH_TESTS) - target_sources(ClangCodeModel PRIVATE +extend_qtc_plugin(ClangCodeModel + CONDITION WITH_TESTS + SOURCES test/clangautomationutils.cpp test/clangautomationutils.h test/clangbatchfileprocessor.cpp test/clangbatchfileprocessor.h test/clangcodecompletion_test.cpp test/clangcodecompletion_test.h test/data/clangtestdata.qrc - ) -endif() +) diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt index 379cf0109a..9e767418f0 100644 --- a/src/plugins/clangtools/CMakeLists.txt +++ b/src/plugins/clangtools/CMakeLists.txt @@ -32,10 +32,10 @@ add_qtc_plugin(ClangTools clangtoolsutils.cpp clangtoolsutils.h ) -if (WITH_TESTS) - target_sources(ClangTools PRIVATE +extend_qtc_plugin(ClangTools + CONDITION WITH_TESTS + SOURCES clangtoolspreconfiguredsessiontests.cpp clangtoolspreconfiguredsessiontests.h clangtoolsunittests.cpp clangtoolsunittests.h clangtoolsunittests.qrc - ) -endif() +) diff --git a/src/plugins/compilationdatabaseprojectmanager/CMakeLists.txt b/src/plugins/compilationdatabaseprojectmanager/CMakeLists.txt index aa29b827ed..5853b44475 100644 --- a/src/plugins/compilationdatabaseprojectmanager/CMakeLists.txt +++ b/src/plugins/compilationdatabaseprojectmanager/CMakeLists.txt @@ -9,8 +9,7 @@ add_qtc_plugin(CompilationDatabaseProjectManager compilationdatabaseutils.cpp compilationdatabaseutils.h ) -if (WITH_TESTS) - target_sources(CompilationDatabaseProjectManager PRIVATE - compilationdatabasetests.cpp compilationdatabasetests.h - ) -endif() +extend_qtc_plugin(CompilationDatabaseProjectManager + CONDITION WITH_TESTS + SOURCES compilationdatabasetests.cpp compilationdatabasetests.h +) diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index 1ad00dca76..06eb1213fd 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -151,22 +151,29 @@ add_qtc_plugin(Core EXPLICIT_MOC dialogs/filepropertiesdialog.h ) -if (WITH_TESTS) - target_sources(Core PRIVATE +extend_qtc_plugin(Core + CONDITION WITH_TESTS + SOURCES locator/locator_test.cpp locator/locatorfiltertest.cpp locator/locatorfiltertest.h testdatadir.cpp testdatadir.h - ) -endif() +) + +extend_qtc_plugin(Core + CONDITION WIN32 + SOURCES progressmanager/progressmanager_win.cpp +) -if (WIN32) - target_sources(Core PRIVATE progressmanager/progressmanager_win.cpp) -elseif (APPLE) - find_library(FWAppKit AppKit) - target_link_libraries(Core PRIVATE ${FWAppKit}) - target_sources(Core PRIVATE +find_library(FWAppKit AppKit) +extend_qtc_plugin(Core + CONDITION APPLE AND FWAppKit + DEPENDS ${FWAppKit} + SOURCES progressmanager/progressmanager_mac.mm - locator/spotlightlocatorfilter.h locator/spotlightlocatorfilter.mm) -else() - target_sources(Core PRIVATE progressmanager/progressmanager_x11.cpp) -endif() + locator/spotlightlocatorfilter.h locator/spotlightlocatorfilter.mm +) + +extend_qtc_plugin(Core + CONDITION (NOT WIN32) AND (NOT APPLE) + SOURCES progressmanager/progressmanager_x11.cpp +) diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt index d38a153ce1..d2072fa5ba 100644 --- a/src/plugins/cppeditor/CMakeLists.txt +++ b/src/plugins/cppeditor/CMakeLists.txt @@ -31,8 +31,9 @@ add_qtc_plugin(CppEditor EXPLICIT_MOC cppeditor.h ) -if (WITH_TESTS) - target_sources(CppEditor PRIVATE +extend_qtc_plugin(CppEditor + CONDITION WITH_TESTS + SOURCES cppdoxygen_test.cpp cppdoxygen_test.h cppeditortestcase.cpp cppeditortestcase.h cppincludehierarchy_test.cpp @@ -40,7 +41,7 @@ if (WITH_TESTS) cppuseselections_test.cpp fileandtokenactions_test.cpp followsymbol_switchmethoddecldef_test.cpp - ) - set_explicit_moc(CppEditor cppdoxygen_test.h) - set_explicit_moc(CppEditor cppquickfix_test.h) -endif() + EXPLICIT_MOC + cppdoxygen_test.h + cppquickfix_test.h +) diff --git a/src/plugins/cpptools/CMakeLists.txt b/src/plugins/cpptools/CMakeLists.txt index 52e6a7cbd4..e810c379f8 100644 --- a/src/plugins/cpptools/CMakeLists.txt +++ b/src/plugins/cpptools/CMakeLists.txt @@ -112,8 +112,9 @@ add_qtc_plugin(CppTools wrappablelineedit.cpp wrappablelineedit.h ) -if (WITH_TESTS) - target_sources(CppTools PRIVATE +extend_qtc_plugin(CppTools + CONDITION WITH_TESTS + SOURCES cppcodegen_test.cpp cppcompletion_test.cpp cppheadersource_test.cpp @@ -127,5 +128,4 @@ if (WITH_TESTS) modelmanagertesthelper.cpp modelmanagertesthelper.h symbolsearcher_test.cpp typehierarchybuilder_test.cpp - ) -endif() +) diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt index c0a2720e10..f88c5ffd60 100644 --- a/src/plugins/debugger/CMakeLists.txt +++ b/src/plugins/debugger/CMakeLists.txt @@ -95,16 +95,15 @@ add_qtc_plugin(Debugger watchwindow.cpp watchwindow.h ) -if (WIN32) - target_sources(Debugger PRIVATE - registerpostmortemaction.cpp registerpostmortemaction.h - ) - target_compile_definitions(Debugger PRIVATE UNICODE _UNICODE) -endif() +extend_qtc_plugin(Debugger + CONDITION WIN32 + SOURCES registerpostmortemaction.cpp registerpostmortemaction.h + DEFINES UNICODE _UNICODE +) -if (WITH_TESTS) - target_sources(Debugger PRIVATE +extend_qtc_plugin(Debugger + CONDITION WITH_TESTS + SOURCES debuggerunittests.qrc unit-tests/simple/main.cpp - ) -endif() +) diff --git a/src/plugins/designer/CMakeLists.txt b/src/plugins/designer/CMakeLists.txt index 52f7b53e18..d51c0ccf3e 100644 --- a/src/plugins/designer/CMakeLists.txt +++ b/src/plugins/designer/CMakeLists.txt @@ -36,6 +36,7 @@ add_qtc_plugin(Designer settingspage.cpp settingspage.h ) -if (WITH_TESTS) - target_sources(Designer PRIVATE gotoslot_test.cpp) -endif() +extend_qtc_plugin(Designer + CONDITION WITH_TESTS AND TARGET Qt5::DesignerComponents AND TARGET Qt5::Designer + SOURCES gotoslot_test.cpp +) diff --git a/src/plugins/fakevim/CMakeLists.txt b/src/plugins/fakevim/CMakeLists.txt index 3363c12c75..0dd4f690f2 100644 --- a/src/plugins/fakevim/CMakeLists.txt +++ b/src/plugins/fakevim/CMakeLists.txt @@ -13,6 +13,7 @@ add_qtc_plugin(FakeVim fakevimtr.h ) -if (WITH_TESTS) - target_sources(FakeVim PRIVATE fakevim_test.cpp) -endif() +extend_qtc_plugin(FakeVim + CONDITION WITH_TESTS + SOURCES fakevim_test.cpp +) diff --git a/src/plugins/genericprojectmanager/CMakeLists.txt b/src/plugins/genericprojectmanager/CMakeLists.txt index 6e6b8eff3b..d41571b5ff 100644 --- a/src/plugins/genericprojectmanager/CMakeLists.txt +++ b/src/plugins/genericprojectmanager/CMakeLists.txt @@ -16,6 +16,7 @@ add_qtc_plugin(GenericProjectManager genericprojectwizard.cpp genericprojectwizard.h ) -if (WITH_TESTS) - target_sources(GenericProjectManager PRIVATE genericprojectplugin_test.cpp) -endif() +extend_qtc_plugin(GenericProjectManager + CONDITION WITH_TESTS + SOURCES genericprojectplugin_test.cpp +) diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt index 0b3a2a2397..6b00fbeb49 100644 --- a/src/plugins/help/CMakeLists.txt +++ b/src/plugins/help/CMakeLists.txt @@ -29,17 +29,22 @@ add_qtc_plugin(Help xbelsupport.cpp xbelsupport.h ) -if (APPLE) - find_library(FWWebKit WebKit) - find_library(FWAppKit AppKit) - target_link_libraries(Help PRIVATE ${FWWebKit} ${FWAppKit}) - target_compile_definitions(Help PRIVATE QTC_MAC_NATIVE_HELPVIEWER) - target_sources(Help PRIVATE macwebkithelpviewer.h macwebkithelpviewer.mm) -endif() +find_library(FWWebKit WebKit) +find_library(FWAppKit AppKit) +extend_qtc_plugin(Help + CONDITION APPLE AND FWWebKit AND FWAppKit + DEPENDS ${FWWebKit} ${FWAppKit} + DEFINES QTC_MAC_NATIVE_HELPVIEWER + SOURCES + macwebkithelpviewer.h + macwebkithelpviewer.mm +) find_package(Qt5WebEngineWidgets QUIET) - -if (TARGET Qt5::WebEngineWidgets) - target_sources(Help PRIVATE webenginehelpviewer.cpp webenginehelpviewer.h) - target_link_libraries(Help PRIVATE Qt5::WebEngineWidgets) -endif() +extend_qtc_plugin(Help + CONDITION TARGET Qt5::WebEngineWidgets + DEPENDS Qt5::WebEngineWidgets + SOURCES + webenginehelpviewer.cpp + webenginehelpviewer.h +) diff --git a/src/plugins/ios/CMakeLists.txt b/src/plugins/ios/CMakeLists.txt index d20d4fe983..4bc429e4f8 100644 --- a/src/plugins/ios/CMakeLists.txt +++ b/src/plugins/ios/CMakeLists.txt @@ -26,8 +26,9 @@ add_qtc_plugin(Ios simulatoroperationdialog.cpp simulatoroperationdialog.h simulatoroperationdialog.ui ) -if (APPLE) - find_library(FWCoreFoundation CoreFoundation) - find_library(FWIOKit IOKit) - target_link_libraries(Ios PRIVATE ${FWCoreFoundation} ${FWIOKit}) -endif() +find_library(FWCoreFoundation CoreFoundation) +find_library(FWIOKit IOKit) +extend_qtc_plugin(Ios + CONDITION APPLE AND FWCoreFoundation AND FWIOKit + DEPENDS ${FWCoreFoundation} ${FWIOKit} +) diff --git a/src/plugins/perfprofiler/CMakeLists.txt b/src/plugins/perfprofiler/CMakeLists.txt index 18f0137110..20345cb038 100644 --- a/src/plugins/perfprofiler/CMakeLists.txt +++ b/src/plugins/perfprofiler/CMakeLists.txt @@ -32,10 +32,10 @@ add_qtc_plugin(PerfProfiler perftracepointdialog.cpp perftracepointdialog.h perftracepointdialog.ui ) -if (WITH_TESTS) - target_sources(PerfProfiler PRIVATE +extend_qtc_plugin(PerfProfiler + CONDITION WITH_TESTS + SOURCES tests/perfprofilertracefile_test.cpp tests/perfprofilertracefile_test.h tests/perfresourcecounter_test.cpp tests/perfresourcecounter_test.h tests/tests.qrc - ) -endif() +) diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index f752e79191..c9413c2385 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -183,26 +183,31 @@ add_qtc_plugin(ProjectExplorer if (TARGET libclang) set(CLANG_BINDIR "$<TARGET_FILE_DIR:libclang>") endif() -target_compile_definitions(ProjectExplorer PRIVATE CLANG_BINDIR="${CLANG_BINDIR}") +extend_qtc_plugin(ProjectExplorer + DEFINES "CLANG_BINDIR=\"${CLANG_BINDIR}\"" +) -if (WIN32) - target_sources(ProjectExplorer PRIVATE - windebuginterface.cpp windebuginterface.h) - target_compile_definitions(ProjectExplorer PRIVATE UNICODE _UNICODE) -endif() +extend_qtc_plugin(ProjectExplorer + CONDITION WIN32 + SOURCES windebuginterface.cpp windebuginterface.h + DEFINES UNICODE _UNICODE +) -if (journald) - target_sources(ProjectExplorer PRIVATE - journaldwatcher.cpp journaldwatcher.h) - target_compile_definitions(ProjectExplorer PRIVATE WITH_JOURNALD) - target_link_libraries(ProjectExplorer PRIVATE systemd) -endif() +extend_qtc_plugin(ProjectExplorer + CONDITION journald + DEPENDS systemd + SOURCES journaldwatcher.cpp journaldwatcher.h + DEFINES WITH_JOURNALD +) -if (WITH_TESTS) - target_sources(ProjectExplorer PRIVATE +extend_qtc_plugin(ProjectExplorer + CONDITION WITH_TESTS + SOURCES jsonwizard/jsonwizard_test.cpp outputparser_test.cpp outputparser_test.h - ) +) +qtc_plugin_enabled(_projectexplorer_enabled ProjectExplorer) +if (WITH_TESTS AND _projectexplorer_enabled) set_source_files_properties(jsonwizard/jsonwizard_test.cpp PROPERTIES HEADER_FILE_ONLY ON ) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 31bddc830e..ebbce08bc4 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -35,6 +35,7 @@ if (APPLE) endif() add_qtc_plugin(componentsplugin + CONDITION TARGET QmlDesigner DEPENDS Core QmlDesigner Utils Qt5::Qml DEFINES COMPONENTS_LIBRARY INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/include @@ -51,6 +52,7 @@ add_qtc_plugin(componentsplugin ) add_qtc_plugin(qtquickplugin + CONDITION TARGET QmlDesigner DEPENDS Core QmlDesigner Utils Qt5::Qml DEFINES QTQUICK_LIBRARY INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/include @@ -61,465 +63,501 @@ add_qtc_plugin(qtquickplugin SKIP_DEBUG_CMAKE_FILE_CHECK ) -function(extend_qtc_plugin name directory) - foreach(source ${ARGN}) - list(APPEND source_list ${directory}/${source}) - endforeach() - target_sources(${name} PRIVATE ${source_list}) - target_include_directories(${name} PUBLIC ${directory}) -endfunction(extend_qtc_plugin) - -extend_qtc_plugin(QmlDesigner ../../../share/qtcreator/qml/qmlpuppet/container - addimportcontainer.cpp addimportcontainer.h - idcontainer.cpp idcontainer.h - imagecontainer.cpp imagecontainer.h - informationcontainer.cpp informationcontainer.h - instancecontainer.cpp instancecontainer.h - mockuptypecontainer.cpp mockuptypecontainer.h - propertyabstractcontainer.cpp propertyabstractcontainer.h - propertybindingcontainer.cpp propertybindingcontainer.h - propertyvaluecontainer.cpp propertyvaluecontainer.h - reparentcontainer.cpp reparentcontainer.h - sharedmemory.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/container + SOURCES + addimportcontainer.cpp addimportcontainer.h + idcontainer.cpp idcontainer.h + imagecontainer.cpp imagecontainer.h + informationcontainer.cpp informationcontainer.h + instancecontainer.cpp instancecontainer.h + mockuptypecontainer.cpp mockuptypecontainer.h + propertyabstractcontainer.cpp propertyabstractcontainer.h + propertybindingcontainer.cpp propertybindingcontainer.h + propertyvaluecontainer.cpp propertyvaluecontainer.h + reparentcontainer.cpp reparentcontainer.h + sharedmemory.h ) if (UNIX) - extend_qtc_plugin(QmlDesigner ../../../share/qtcreator/qml/qmlpuppet/container - sharedmemory_unix.cpp + extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/container + SOURCES sharedmemory_unix.cpp ) if (NOT APPLE) - target_link_libraries(QmlDesigner PRIVATE rt) + extend_qtc_plugin(QmlDesigner DEPENDS rt) endif() else() - extend_qtc_plugin(QmlDesigner ../../../share/qtcreator/qml/qmlpuppet/container - sharedmemory_qt.cpp + extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/container + SOURCES sharedmemory_qt.cpp ) endif() -extend_qtc_plugin(QmlDesigner ../../../share/qtcreator/qml/qmlpuppet/commands - changeauxiliarycommand.cpp changeauxiliarycommand.h - changebindingscommand.cpp changebindingscommand.h - changefileurlcommand.cpp changefileurlcommand.h - changeidscommand.cpp changeidscommand.h - changenodesourcecommand.cpp changenodesourcecommand.h - changestatecommand.cpp changestatecommand.h - changevaluescommand.cpp changevaluescommand.h - childrenchangedcommand.cpp childrenchangedcommand.h - clearscenecommand.cpp clearscenecommand.h - completecomponentcommand.cpp completecomponentcommand.h - componentcompletedcommand.cpp componentcompletedcommand.h - createinstancescommand.cpp createinstancescommand.h - createscenecommand.cpp createscenecommand.h - debugoutputcommand.cpp debugoutputcommand.h - endpuppetcommand.cpp endpuppetcommand.h - informationchangedcommand.cpp informationchangedcommand.h - pixmapchangedcommand.cpp pixmapchangedcommand.h - puppetalivecommand.cpp puppetalivecommand.h - removeinstancescommand.cpp removeinstancescommand.h - removepropertiescommand.cpp removepropertiescommand.h - removesharedmemorycommand.cpp removesharedmemorycommand.h - reparentinstancescommand.cpp reparentinstancescommand.h - statepreviewimagechangedcommand.cpp statepreviewimagechangedcommand.h - synchronizecommand.cpp synchronizecommand.h - tokencommand.cpp tokencommand.h - valueschangedcommand.cpp valueschangedcommand.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/commands + SOURCES + changeauxiliarycommand.cpp changeauxiliarycommand.h + changebindingscommand.cpp changebindingscommand.h + changefileurlcommand.cpp changefileurlcommand.h + changeidscommand.cpp changeidscommand.h + changenodesourcecommand.cpp changenodesourcecommand.h + changestatecommand.cpp changestatecommand.h + changevaluescommand.cpp changevaluescommand.h + childrenchangedcommand.cpp childrenchangedcommand.h + clearscenecommand.cpp clearscenecommand.h + completecomponentcommand.cpp completecomponentcommand.h + componentcompletedcommand.cpp componentcompletedcommand.h + createinstancescommand.cpp createinstancescommand.h + createscenecommand.cpp createscenecommand.h + debugoutputcommand.cpp debugoutputcommand.h + endpuppetcommand.cpp endpuppetcommand.h + informationchangedcommand.cpp informationchangedcommand.h + pixmapchangedcommand.cpp pixmapchangedcommand.h + puppetalivecommand.cpp puppetalivecommand.h + removeinstancescommand.cpp removeinstancescommand.h + removepropertiescommand.cpp removepropertiescommand.h + removesharedmemorycommand.cpp removesharedmemorycommand.h + reparentinstancescommand.cpp reparentinstancescommand.h + statepreviewimagechangedcommand.cpp statepreviewimagechangedcommand.h + synchronizecommand.cpp synchronizecommand.h + tokencommand.cpp tokencommand.h + valueschangedcommand.cpp valueschangedcommand.h ) -extend_qtc_plugin(QmlDesigner ../../../share/qtcreator/qml/qmlpuppet/interfaces - nodeinstanceserverinterface.cpp - commondefines.h - nodeinstanceclientinterface.h - nodeinstanceglobal.h - nodeinstanceserverinterface.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/interfaces + SOURCES + nodeinstanceserverinterface.cpp + commondefines.h + nodeinstanceclientinterface.h + nodeinstanceglobal.h + nodeinstanceserverinterface.h ) -extend_qtc_plugin(QmlDesigner ../../../share/qtcreator/qml/qmlpuppet/types - enumeration.cpp enumeration.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/types + SOURCES enumeration.cpp enumeration.h ) -extend_qtc_plugin(QmlDesigner components/componentcore - abstractaction.cpp abstractaction.h - abstractactiongroup.cpp abstractactiongroup.h - actioninterface.h - addimagesdialog.cpp addimagesdialog.h - addsignalhandlerdialog.cpp addsignalhandlerdialog.h addsignalhandlerdialog.ui - changestyleaction.cpp changestyleaction.h - componentcore.qrc - componentcore_constants.h - crumblebar.cpp crumblebar.h - designeractionmanager.cpp designeractionmanager.h - designeractionmanagerview.cpp designeractionmanagerview.h - findimplementation.cpp findimplementation.h - layoutingridlayout.cpp layoutingridlayout.h - modelnodecontextmenu.cpp modelnodecontextmenu.h - modelnodecontextmenu_helper.cpp modelnodecontextmenu_helper.h - modelnodeoperations.cpp modelnodeoperations.h - qmldesignericonprovider.cpp qmldesignericonprovider.h - selectioncontext.cpp selectioncontext.h - theme.cpp theme.h - zoomaction.cpp zoomaction.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/componentcore + PUBLIC_INCLUDES components/componentcore + SOURCES + abstractaction.cpp abstractaction.h + abstractactiongroup.cpp abstractactiongroup.h + actioninterface.h + addimagesdialog.cpp addimagesdialog.h + addsignalhandlerdialog.cpp addsignalhandlerdialog.h addsignalhandlerdialog.ui + changestyleaction.cpp changestyleaction.h + componentcore.qrc + componentcore_constants.h + crumblebar.cpp crumblebar.h + designeractionmanager.cpp designeractionmanager.h + designeractionmanagerview.cpp designeractionmanagerview.h + findimplementation.cpp findimplementation.h + layoutingridlayout.cpp layoutingridlayout.h + modelnodecontextmenu.cpp modelnodecontextmenu.h + modelnodecontextmenu_helper.cpp modelnodecontextmenu_helper.h + modelnodeoperations.cpp modelnodeoperations.h + qmldesignericonprovider.cpp qmldesignericonprovider.h + selectioncontext.cpp selectioncontext.h + theme.cpp theme.h + zoomaction.cpp zoomaction.h ) -extend_qtc_plugin(QmlDesigner components/debugview - debugview.cpp debugview.h - debugviewwidget.cpp debugviewwidget.h debugviewwidget.ui +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/debugview + SOURCES + debugview.cpp debugview.h + debugviewwidget.cpp debugviewwidget.h debugviewwidget.ui ) -extend_qtc_plugin(QmlDesigner components/formeditor - abstractcustomtool.cpp abstractcustomtool.h - abstractformeditortool.cpp abstractformeditortool.h - anchorindicator.cpp anchorindicator.h - anchorindicatorgraphicsitem.cpp anchorindicatorgraphicsitem.h - backgroundaction.cpp backgroundaction.h - bindingindicator.cpp bindingindicator.h - bindingindicatorgraphicsitem.cpp bindingindicatorgraphicsitem.h - contentnoteditableindicator.cpp contentnoteditableindicator.h - controlelement.cpp controlelement.h - dragtool.cpp dragtool.h - formeditor.qrc - formeditorgraphicsview.cpp formeditorgraphicsview.h - formeditoritem.cpp formeditoritem.h - formeditorscene.cpp formeditorscene.h - formeditorsubwindow.h - formeditortoolbutton.cpp formeditortoolbutton.h - formeditorview.cpp formeditorview.h - formeditorwidget.cpp formeditorwidget.h - itemutilfunctions.cpp itemutilfunctions.h - layeritem.cpp layeritem.h - lineeditaction.cpp lineeditaction.h - movemanipulator.cpp movemanipulator.h - movetool.cpp movetool.h - numberseriesaction.cpp numberseriesaction.h - onedimensionalcluster.cpp onedimensionalcluster.h - resizecontroller.cpp resizecontroller.h - resizehandleitem.cpp resizehandleitem.h - resizeindicator.cpp resizeindicator.h - resizemanipulator.cpp resizemanipulator.h - resizetool.cpp resizetool.h - rubberbandselectionmanipulator.cpp rubberbandselectionmanipulator.h - scaleitem.cpp scaleitem.h - scalemanipulator.cpp scalemanipulator.h - selectionindicator.cpp selectionindicator.h - selectionrectangle.cpp selectionrectangle.h - selectiontool.cpp selectiontool.h - singleselectionmanipulator.cpp singleselectionmanipulator.h - snapper.cpp snapper.h - snappinglinecreator.cpp snappinglinecreator.h - toolbox.cpp toolbox.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/formeditor + SOURCES + abstractcustomtool.cpp abstractcustomtool.h + abstractformeditortool.cpp abstractformeditortool.h + anchorindicator.cpp anchorindicator.h + anchorindicatorgraphicsitem.cpp anchorindicatorgraphicsitem.h + backgroundaction.cpp backgroundaction.h + bindingindicator.cpp bindingindicator.h + bindingindicatorgraphicsitem.cpp bindingindicatorgraphicsitem.h + contentnoteditableindicator.cpp contentnoteditableindicator.h + controlelement.cpp controlelement.h + dragtool.cpp dragtool.h + formeditor.qrc + formeditorgraphicsview.cpp formeditorgraphicsview.h + formeditoritem.cpp formeditoritem.h + formeditorscene.cpp formeditorscene.h + formeditorsubwindow.h + formeditortoolbutton.cpp formeditortoolbutton.h + formeditorview.cpp formeditorview.h + formeditorwidget.cpp formeditorwidget.h + itemutilfunctions.cpp itemutilfunctions.h + layeritem.cpp layeritem.h + lineeditaction.cpp lineeditaction.h + movemanipulator.cpp movemanipulator.h + movetool.cpp movetool.h + numberseriesaction.cpp numberseriesaction.h + onedimensionalcluster.cpp onedimensionalcluster.h + resizecontroller.cpp resizecontroller.h + resizehandleitem.cpp resizehandleitem.h + resizeindicator.cpp resizeindicator.h + resizemanipulator.cpp resizemanipulator.h + resizetool.cpp resizetool.h + rubberbandselectionmanipulator.cpp rubberbandselectionmanipulator.h + scaleitem.cpp scaleitem.h + scalemanipulator.cpp scalemanipulator.h + selectionindicator.cpp selectionindicator.h + selectionrectangle.cpp selectionrectangle.h + selectiontool.cpp selectiontool.h + singleselectionmanipulator.cpp singleselectionmanipulator.h + snapper.cpp snapper.h + snappinglinecreator.cpp snappinglinecreator.h + toolbox.cpp toolbox.h ) -extend_qtc_plugin(QmlDesigner components/importmanager - importlabel.cpp importlabel.h - importmanager.qrc - importmanagercombobox.cpp importmanagercombobox.h - importmanagerview.cpp importmanagerview.h - importswidget.cpp importswidget.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/importmanager + SOURCES + importlabel.cpp importlabel.h + importmanager.qrc + importmanagercombobox.cpp importmanagercombobox.h + importmanagerview.cpp importmanagerview.h + importswidget.cpp importswidget.h ) -extend_qtc_plugin(QmlDesigner components/integration - componentaction.cpp componentaction.h - componentview.cpp componentview.h - designdocument.cpp designdocument.h - designdocumentview.cpp designdocumentview.h - stackedutilitypanelcontroller.cpp stackedutilitypanelcontroller.h - utilitypanelcontroller.cpp utilitypanelcontroller.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/integration + SOURCES + componentaction.cpp componentaction.h + componentview.cpp componentview.h + designdocument.cpp designdocument.h + designdocumentview.cpp designdocumentview.h + stackedutilitypanelcontroller.cpp stackedutilitypanelcontroller.h + utilitypanelcontroller.cpp utilitypanelcontroller.h ) -extend_qtc_plugin(QmlDesigner components/itemlibrary - customfilesystemmodel.cpp customfilesystemmodel.h - itemlibrary.qrc - itemlibraryimageprovider.cpp itemlibraryimageprovider.h - itemlibraryitem.cpp itemlibraryitem.h - itemlibrarymodel.cpp itemlibrarymodel.h - itemlibraryresourceview.cpp itemlibraryresourceview.h - itemlibrarysection.cpp itemlibrarysection.h - itemlibrarysectionmodel.cpp itemlibrarysectionmodel.h - itemlibraryview.cpp itemlibraryview.h - itemlibrarywidget.cpp itemlibrarywidget.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/itemlibrary + SOURCES + customfilesystemmodel.cpp customfilesystemmodel.h + itemlibrary.qrc + itemlibraryimageprovider.cpp itemlibraryimageprovider.h + itemlibraryitem.cpp itemlibraryitem.h + itemlibrarymodel.cpp itemlibrarymodel.h + itemlibraryresourceview.cpp itemlibraryresourceview.h + itemlibrarysection.cpp itemlibrarysection.h + itemlibrarysectionmodel.cpp itemlibrarysectionmodel.h + itemlibraryview.cpp itemlibraryview.h + itemlibrarywidget.cpp itemlibrarywidget.h ) -extend_qtc_plugin(QmlDesigner components/navigator - iconcheckboxitemdelegate.cpp iconcheckboxitemdelegate.h - nameitemdelegate.cpp nameitemdelegate.h - navigator.qrc - navigatormodelinterface.h - navigatortreemodel.cpp navigatortreemodel.h - navigatortreeview.cpp navigatortreeview.h - navigatorview.cpp navigatorview.h - navigatorwidget.cpp navigatorwidget.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/navigator + SOURCES + iconcheckboxitemdelegate.cpp iconcheckboxitemdelegate.h + nameitemdelegate.cpp nameitemdelegate.h + navigator.qrc + navigatormodelinterface.h + navigatortreemodel.cpp navigatortreemodel.h + navigatortreeview.cpp navigatortreeview.h + navigatorview.cpp navigatorview.h + navigatorwidget.cpp navigatorwidget.h ) -extend_qtc_plugin(QmlDesigner components/propertyeditor - designerpropertymap.cpp designerpropertymap.h - fileresourcesmodel.cpp fileresourcesmodel.h - gradientmodel.cpp gradientmodel.h - gradientpresetcustomlistmodel.cpp gradientpresetcustomlistmodel.h - gradientpresetdefaultlistmodel.cpp gradientpresetdefaultlistmodel.h - gradientpresetitem.cpp gradientpresetitem.h - gradientpresetlistmodel.cpp gradientpresetlistmodel.h - propertyeditorcontextobject.cpp propertyeditorcontextobject.h - propertyeditorqmlbackend.cpp propertyeditorqmlbackend.h - propertyeditortransaction.cpp propertyeditortransaction.h - propertyeditorvalue.cpp propertyeditorvalue.h - propertyeditorview.cpp propertyeditorview.h - propertyeditorwidget.cpp propertyeditorwidget.h - qmlanchorbindingproxy.cpp qmlanchorbindingproxy.h - qmlmodelnodeproxy.cpp qmlmodelnodeproxy.h - quick2propertyeditorview.cpp quick2propertyeditorview.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/propertyeditor + SOURCES + designerpropertymap.cpp designerpropertymap.h + fileresourcesmodel.cpp fileresourcesmodel.h + gradientmodel.cpp gradientmodel.h + gradientpresetcustomlistmodel.cpp gradientpresetcustomlistmodel.h + gradientpresetdefaultlistmodel.cpp gradientpresetdefaultlistmodel.h + gradientpresetitem.cpp gradientpresetitem.h + gradientpresetlistmodel.cpp gradientpresetlistmodel.h + propertyeditorcontextobject.cpp propertyeditorcontextobject.h + propertyeditorqmlbackend.cpp propertyeditorqmlbackend.h + propertyeditortransaction.cpp propertyeditortransaction.h + propertyeditorvalue.cpp propertyeditorvalue.h + propertyeditorview.cpp propertyeditorview.h + propertyeditorwidget.cpp propertyeditorwidget.h + qmlanchorbindingproxy.cpp qmlanchorbindingproxy.h + qmlmodelnodeproxy.cpp qmlmodelnodeproxy.h + quick2propertyeditorview.cpp quick2propertyeditorview.h ) -extend_qtc_plugin(QmlDesigner components - resources/resources.qrc +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components + SOURCES resources/resources.qrc ) -extend_qtc_plugin(QmlDesigner components/stateseditor - stateseditorimageprovider.cpp stateseditorimageprovider.h - stateseditormodel.cpp stateseditormodel.h - stateseditorview.cpp stateseditorview.h - stateseditorwidget.cpp stateseditorwidget.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/stateseditor + SOURCES + stateseditorimageprovider.cpp stateseditorimageprovider.h + stateseditormodel.cpp stateseditormodel.h + stateseditorview.cpp stateseditorview.h + stateseditorwidget.cpp stateseditorwidget.h ) -extend_qtc_plugin(QmlDesigner components/texteditor - texteditorstatusbar.cpp texteditorstatusbar.h - texteditorview.cpp texteditorview.h - texteditorwidget.cpp texteditorwidget.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX components/texteditor + SOURCES + texteditorstatusbar.cpp texteditorstatusbar.h + texteditorview.cpp texteditorview.h + texteditorwidget.cpp texteditorwidget.h ) -extend_qtc_plugin(QmlDesigner designercore - exceptions/exception.cpp - exceptions/invalidargumentexception.cpp - exceptions/invalididexception.cpp - exceptions/invalidmetainfoexception.cpp - exceptions/invalidmodelnodeexception.cpp - exceptions/invalidmodelstateexception.cpp - exceptions/invalidpropertyexception.cpp - exceptions/invalidqmlsourceexception.cpp - exceptions/invalidreparentingexception.cpp - exceptions/invalidslideindexexception.cpp - exceptions/notimplementedexception.cpp - exceptions/removebasestateexception.cpp - exceptions/rewritingexception.cpp - - filemanager/addarraymembervisitor.cpp filemanager/addarraymembervisitor.h - filemanager/addobjectvisitor.cpp filemanager/addobjectvisitor.h - filemanager/addpropertyvisitor.cpp filemanager/addpropertyvisitor.h - filemanager/astobjecttextextractor.cpp filemanager/astobjecttextextractor.h - filemanager/changeimportsvisitor.cpp filemanager/changeimportsvisitor.h - filemanager/changeobjecttypevisitor.cpp filemanager/changeobjecttypevisitor.h - filemanager/changepropertyvisitor.cpp filemanager/changepropertyvisitor.h - filemanager/firstdefinitionfinder.cpp filemanager/firstdefinitionfinder.h - filemanager/moveobjectbeforeobjectvisitor.cpp filemanager/moveobjectbeforeobjectvisitor.h - filemanager/moveobjectvisitor.cpp filemanager/moveobjectvisitor.h - filemanager/objectlengthcalculator.cpp filemanager/objectlengthcalculator.h - filemanager/qmlrefactoring.cpp filemanager/qmlrefactoring.h - filemanager/qmlrewriter.cpp filemanager/qmlrewriter.h - filemanager/removepropertyvisitor.cpp filemanager/removepropertyvisitor.h - filemanager/removeuiobjectmembervisitor.cpp filemanager/removeuiobjectmembervisitor.h - - include/abstractproperty.h - include/abstractview.h - include/anchorline.h - include/basetexteditmodifier.h - include/bindingproperty.h - include/bytearraymodifier.h - include/componenttextmodifier.h - include/customnotifications.h - include/documentmessage.h - include/exception.h - include/forwardview.h - include/import.h - include/invalidargumentexception.h - include/invalididexception.h - include/invalidmetainfoexception.h - include/invalidmodelnodeexception.h - include/invalidmodelstateexception.h - include/invalidpropertyexception.h - include/invalidqmlsourceexception.h - include/invalidreparentingexception.h - include/invalidslideindexexception.h - include/itemlibraryinfo.h - include/iwidgetplugin.h - include/mathutils.h - include/metainfo.h - include/metainforeader.h - include/model.h - include/modelmerger.h - include/modelnode.h - include/modelnodepositionstorage.h - include/modificationgroupexception.h - include/modificationgrouptoken.h - include/nodeabstractproperty.h - include/nodeanchors.h - include/nodehints.h - include/nodeinstance.h - include/nodeinstanceview.h - include/nodelistproperty.h - include/nodemetainfo.h - include/nodeproperty.h - include/notimplementedexception.h - include/objectpropertybinding.h - include/plaintexteditmodifier.h - include/propertybinding.h - include/propertycontainer.h - include/propertynode.h - include/propertyparser.h - include/qmlanchors.h - include/qmlchangeset.h - include/qmldesignercorelib_global.h - include/qmlitemnode.h - include/qmlmodelnodefacade.h - include/qmlobjectnode.h - include/qmlstate.h - include/qmltimeline.h - include/qmltimelinekeyframegroup.h - include/removebasestateexception.h - include/rewriterview.h - include/rewritingexception.h - include/signalhandlerproperty.h - include/subcomponentmanager.h - include/textmodifier.h - include/variantproperty.h - include/viewmanager.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX designercore + SOURCES + exceptions/exception.cpp + exceptions/invalidargumentexception.cpp + exceptions/invalididexception.cpp + exceptions/invalidmetainfoexception.cpp + exceptions/invalidmodelnodeexception.cpp + exceptions/invalidmodelstateexception.cpp + exceptions/invalidpropertyexception.cpp + exceptions/invalidqmlsourceexception.cpp + exceptions/invalidreparentingexception.cpp + exceptions/invalidslideindexexception.cpp + exceptions/notimplementedexception.cpp + exceptions/removebasestateexception.cpp + exceptions/rewritingexception.cpp + + filemanager/addarraymembervisitor.cpp filemanager/addarraymembervisitor.h + filemanager/addobjectvisitor.cpp filemanager/addobjectvisitor.h + filemanager/addpropertyvisitor.cpp filemanager/addpropertyvisitor.h + filemanager/astobjecttextextractor.cpp filemanager/astobjecttextextractor.h + filemanager/changeimportsvisitor.cpp filemanager/changeimportsvisitor.h + filemanager/changeobjecttypevisitor.cpp filemanager/changeobjecttypevisitor.h + filemanager/changepropertyvisitor.cpp filemanager/changepropertyvisitor.h + filemanager/firstdefinitionfinder.cpp filemanager/firstdefinitionfinder.h + filemanager/moveobjectbeforeobjectvisitor.cpp filemanager/moveobjectbeforeobjectvisitor.h + filemanager/moveobjectvisitor.cpp filemanager/moveobjectvisitor.h + filemanager/objectlengthcalculator.cpp filemanager/objectlengthcalculator.h + filemanager/qmlrefactoring.cpp filemanager/qmlrefactoring.h + filemanager/qmlrewriter.cpp filemanager/qmlrewriter.h + filemanager/removepropertyvisitor.cpp filemanager/removepropertyvisitor.h + filemanager/removeuiobjectmembervisitor.cpp filemanager/removeuiobjectmembervisitor.h + + include/abstractproperty.h + include/abstractview.h + include/anchorline.h + include/basetexteditmodifier.h + include/bindingproperty.h + include/bytearraymodifier.h + include/componenttextmodifier.h + include/customnotifications.h + include/documentmessage.h + include/exception.h + include/forwardview.h + include/import.h + include/invalidargumentexception.h + include/invalididexception.h + include/invalidmetainfoexception.h + include/invalidmodelnodeexception.h + include/invalidmodelstateexception.h + include/invalidpropertyexception.h + include/invalidqmlsourceexception.h + include/invalidreparentingexception.h + include/invalidslideindexexception.h + include/itemlibraryinfo.h + include/iwidgetplugin.h + include/mathutils.h + include/metainfo.h + include/metainforeader.h + include/model.h + include/modelmerger.h + include/modelnode.h + include/modelnodepositionstorage.h + include/modificationgroupexception.h + include/modificationgrouptoken.h + include/nodeabstractproperty.h + include/nodeanchors.h + include/nodehints.h + include/nodeinstance.h + include/nodeinstanceview.h + include/nodelistproperty.h + include/nodemetainfo.h + include/nodeproperty.h + include/notimplementedexception.h + include/objectpropertybinding.h + include/plaintexteditmodifier.h + include/propertybinding.h + include/propertycontainer.h + include/propertynode.h + include/propertyparser.h + include/qmlanchors.h + include/qmlchangeset.h + include/qmldesignercorelib_global.h + include/qmlitemnode.h + include/qmlmodelnodefacade.h + include/qmlobjectnode.h + include/qmlstate.h + include/qmltimeline.h + include/qmltimelinekeyframegroup.h + include/removebasestateexception.h + include/rewriterview.h + include/rewritingexception.h + include/signalhandlerproperty.h + include/subcomponentmanager.h + include/textmodifier.h + include/variantproperty.h + include/viewmanager.h ) -extend_qtc_plugin(QmlDesigner designercore/instances - nodeinstance.cpp - nodeinstanceserverproxy.cpp nodeinstanceserverproxy.h - nodeinstanceview.cpp - puppetbuildprogressdialog.cpp puppetbuildprogressdialog.h puppetbuildprogressdialog.ui - puppetcreator.cpp puppetcreator.h - puppetdialog.cpp puppetdialog.h puppetdialog.ui +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX designercore/instances + SOURCES + nodeinstance.cpp + nodeinstanceserverproxy.cpp nodeinstanceserverproxy.h + nodeinstanceview.cpp + puppetbuildprogressdialog.cpp puppetbuildprogressdialog.h puppetbuildprogressdialog.ui + puppetcreator.cpp puppetcreator.h + puppetdialog.cpp puppetdialog.h puppetdialog.ui ) -extend_qtc_plugin(QmlDesigner designercore - metainfo/itemlibraryinfo.cpp - metainfo/metainfo.cpp - metainfo/metainforeader.cpp - metainfo/nodehints.cpp - metainfo/nodemetainfo.cpp - metainfo/subcomponentmanager.cpp - - model/abstractproperty.cpp - model/abstractview.cpp - model/anchorline.cpp - model/basetexteditmodifier.cpp - model/bindingproperty.cpp - model/componenttextmodifier.cpp - model/documentmessage.cpp - model/import.cpp - model/internalbindingproperty.cpp model/internalbindingproperty.h - model/internalnode.cpp model/internalnode_p.h - model/internalnodeabstractproperty.cpp model/internalnodeabstractproperty.h - model/internalnodelistproperty.cpp model/internalnodelistproperty.h - model/internalnodeproperty.cpp model/internalnodeproperty.h - model/internalproperty.cpp model/internalproperty.h - model/internalsignalhandlerproperty.cpp model/internalsignalhandlerproperty.h - model/internalvariantproperty.cpp model/internalvariantproperty.h - model/model.cpp model/model_p.h - model/modelmerger.cpp - model/modelnode.cpp - model/modelnodepositionrecalculator.cpp model/modelnodepositionrecalculator.h - model/modelnodepositionstorage.cpp - model/modeltotextmerger.cpp model/modeltotextmerger.h - model/nodeabstractproperty.cpp - model/nodelistproperty.cpp - model/nodeproperty.cpp - model/plaintexteditmodifier.cpp - model/propertycontainer.cpp - model/propertynode.cpp - model/propertyparser.cpp - model/qmlanchors.cpp - model/qmlchangeset.cpp - model/qmlitemnode.cpp - model/qmlmodelnodefacade.cpp - model/qmlobjectnode.cpp - model/qmlstate.cpp - model/qmltextgenerator.cpp model/qmltextgenerator.h - model/qmltimeline.cpp - model/qmltimelinekeyframegroup.cpp - model/rewriteaction.cpp model/rewriteaction.h - model/rewriteactioncompressor.cpp model/rewriteactioncompressor.h - model/rewriterview.cpp - model/signalhandlerproperty.cpp - model/textmodifier.cpp - model/texttomodelmerger.cpp model/texttomodelmerger.h - model/variantproperty.cpp - model/viewmanager.cpp - - pluginmanager/widgetpluginmanager.cpp pluginmanager/widgetpluginmanager.h - pluginmanager/widgetpluginpath.cpp pluginmanager/widgetpluginpath.h - rewritertransaction.cpp rewritertransaction.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX designercore + SOURCES + metainfo/itemlibraryinfo.cpp + metainfo/metainfo.cpp + metainfo/metainforeader.cpp + metainfo/nodehints.cpp + metainfo/nodemetainfo.cpp + metainfo/subcomponentmanager.cpp + + model/abstractproperty.cpp + model/abstractview.cpp + model/anchorline.cpp + model/basetexteditmodifier.cpp + model/bindingproperty.cpp + model/componenttextmodifier.cpp + model/documentmessage.cpp + model/import.cpp + model/internalbindingproperty.cpp model/internalbindingproperty.h + model/internalnode.cpp model/internalnode_p.h + model/internalnodeabstractproperty.cpp model/internalnodeabstractproperty.h + model/internalnodelistproperty.cpp model/internalnodelistproperty.h + model/internalnodeproperty.cpp model/internalnodeproperty.h + model/internalproperty.cpp model/internalproperty.h + model/internalsignalhandlerproperty.cpp model/internalsignalhandlerproperty.h + model/internalvariantproperty.cpp model/internalvariantproperty.h + model/model.cpp model/model_p.h + model/modelmerger.cpp + model/modelnode.cpp + model/modelnodepositionrecalculator.cpp model/modelnodepositionrecalculator.h + model/modelnodepositionstorage.cpp + model/modeltotextmerger.cpp model/modeltotextmerger.h + model/nodeabstractproperty.cpp + model/nodelistproperty.cpp + model/nodeproperty.cpp + model/plaintexteditmodifier.cpp + model/propertycontainer.cpp + model/propertynode.cpp + model/propertyparser.cpp + model/qmlanchors.cpp + model/qmlchangeset.cpp + model/qmlitemnode.cpp + model/qmlmodelnodefacade.cpp + model/qmlobjectnode.cpp + model/qmlstate.cpp + model/qmltextgenerator.cpp model/qmltextgenerator.h + model/qmltimeline.cpp + model/qmltimelinekeyframegroup.cpp + model/rewriteaction.cpp model/rewriteaction.h + model/rewriteactioncompressor.cpp model/rewriteactioncompressor.h + model/rewriterview.cpp + model/signalhandlerproperty.cpp + model/textmodifier.cpp + model/texttomodelmerger.cpp model/texttomodelmerger.h + model/variantproperty.cpp + model/viewmanager.cpp + + pluginmanager/widgetpluginmanager.cpp pluginmanager/widgetpluginmanager.h + pluginmanager/widgetpluginpath.cpp pluginmanager/widgetpluginpath.h + rewritertransaction.cpp rewritertransaction.h ) -extend_qtc_plugin(QmlDesigner qmldesignerextension - colortool/colortool.cpp colortool/colortool.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX qmldesignerextension/colortool + SOURCES colortool.cpp colortool.h ) -extend_qtc_plugin(QmlDesigner qmldesignerextension/connectioneditor - addnewbackenddialog.cpp addnewbackenddialog.h addnewbackenddialog.ui - backendmodel.cpp backendmodel.h - bindingmodel.cpp bindingmodel.h - connectioneditor.qrc - connectionmodel.cpp connectionmodel.h - connectionview.cpp connectionview.h - connectionviewwidget.cpp connectionviewwidget.h connectionviewwidget.ui - delegates.cpp delegates.h - dynamicpropertiesmodel.cpp dynamicpropertiesmodel.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX qmldesignerextension/connectioneditor + SOURCES + addnewbackenddialog.cpp addnewbackenddialog.h addnewbackenddialog.ui + backendmodel.cpp backendmodel.h + bindingmodel.cpp bindingmodel.h + connectioneditor.qrc + connectionmodel.cpp connectionmodel.h + connectionview.cpp connectionview.h + connectionviewwidget.cpp connectionviewwidget.h connectionviewwidget.ui + delegates.cpp delegates.h + dynamicpropertiesmodel.cpp dynamicpropertiesmodel.h ) -extend_qtc_plugin(QmlDesigner qmldesignerextension - pathtool/controlpoint.cpp pathtool/controlpoint.h - pathtool/cubicsegment.cpp pathtool/cubicsegment.h - pathtool/pathitem.cpp pathtool/pathitem.h - pathtool/pathselectionmanipulator.cpp pathtool/pathselectionmanipulator.h - pathtool/pathtool.cpp pathtool/pathtool.h - pathtool/pathtoolview.cpp pathtool/pathtoolview.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX qmldesignerextension + SOURCES + pathtool/controlpoint.cpp pathtool/controlpoint.h + pathtool/cubicsegment.cpp pathtool/cubicsegment.h + pathtool/pathitem.cpp pathtool/pathitem.h + pathtool/pathselectionmanipulator.cpp pathtool/pathselectionmanipulator.h + pathtool/pathtool.cpp pathtool/pathtool.h + pathtool/pathtoolview.cpp pathtool/pathtoolview.h - qmldesignerextensionconstants.h - qmldesignerextension_global.h + qmldesignerextensionconstants.h + qmldesignerextension_global.h - sourcetool/sourcetool.cpp sourcetool/sourcetool.h + sourcetool/sourcetool.cpp sourcetool/sourcetool.h - texttool/textedititem.cpp texttool/textedititem.h - texttool/textedititemwidget.cpp texttool/textedititemwidget.h - texttool/texttool.cpp texttool/texttool.h + texttool/textedititem.cpp texttool/textedititem.h + texttool/textedititemwidget.cpp texttool/textedititemwidget.h + texttool/texttool.cpp texttool/texttool.h ) -extend_qtc_plugin(QmlDesigner qmldesignerextension/timelineeditor - canvas.cpp canvas.h - canvasstyledialog.cpp canvasstyledialog.h - easingcurve.cpp easingcurve.h - easingcurvedialog.cpp easingcurvedialog.h - preseteditor.cpp preseteditor.h - setframevaluedialog.cpp setframevaluedialog.h setframevaluedialog.ui - splineeditor.cpp splineeditor.h - timeline.qrc - timelineabstracttool.cpp timelineabstracttool.h - timelineactions.cpp timelineactions.h - timelineanimationform.cpp timelineanimationform.h timelineanimationform.ui - timelineconstants.h - timelinecontext.cpp timelinecontext.h - timelinecontrols.cpp timelinecontrols.h - timelineform.cpp timelineform.h timelineform.ui - timelinegraphicslayout.cpp timelinegraphicslayout.h - timelinegraphicsscene.cpp timelinegraphicsscene.h - timelineicons.h - timelineitem.cpp timelineitem.h - timelinemovableabstractitem.cpp timelinemovableabstractitem.h - timelinemovetool.cpp timelinemovetool.h - timelineplaceholder.cpp timelineplaceholder.h - timelinepropertyitem.cpp timelinepropertyitem.h - timelinesectionitem.cpp timelinesectionitem.h - timelineselectiontool.cpp timelineselectiontool.h - timelinesettingsdialog.cpp - timelinesettingsdialog.h timelinesettingsdialog.ui - timelinesettingsmodel.cpp timelinesettingsmodel.h - timelinetoolbar.cpp timelinetoolbar.h - timelinetoolbutton.cpp timelinetoolbutton.h - timelinetooldelegate.cpp timelinetooldelegate.h - timelineutils.cpp timelineutils.h - timelineview.cpp timelineview.h - timelinewidget.cpp timelinewidget.h +extend_qtc_plugin(QmlDesigner + SOURCES_PREFIX qmldesignerextension/timelineeditor + SOURCES + canvas.cpp canvas.h + canvasstyledialog.cpp canvasstyledialog.h + easingcurve.cpp easingcurve.h + easingcurvedialog.cpp easingcurvedialog.h + preseteditor.cpp preseteditor.h + setframevaluedialog.cpp setframevaluedialog.h setframevaluedialog.ui + splineeditor.cpp splineeditor.h + timeline.qrc + timelineabstracttool.cpp timelineabstracttool.h + timelineactions.cpp timelineactions.h + timelineanimationform.cpp timelineanimationform.h timelineanimationform.ui + timelineconstants.h + timelinecontext.cpp timelinecontext.h + timelinecontrols.cpp timelinecontrols.h + timelineform.cpp timelineform.h timelineform.ui + timelinegraphicslayout.cpp timelinegraphicslayout.h + timelinegraphicsscene.cpp timelinegraphicsscene.h + timelineicons.h + timelineitem.cpp timelineitem.h + timelinemovableabstractitem.cpp timelinemovableabstractitem.h + timelinemovetool.cpp timelinemovetool.h + timelineplaceholder.cpp timelineplaceholder.h + timelinepropertyitem.cpp timelinepropertyitem.h + timelinesectionitem.cpp timelinesectionitem.h + timelineselectiontool.cpp timelineselectiontool.h + timelinesettingsdialog.cpp + timelinesettingsdialog.h timelinesettingsdialog.ui + timelinesettingsmodel.cpp timelinesettingsmodel.h + timelinetoolbar.cpp timelinetoolbar.h + timelinetoolbutton.cpp timelinetoolbutton.h + timelinetooldelegate.cpp timelinetooldelegate.h + timelineutils.cpp timelineutils.h + timelineview.cpp timelineview.h + timelinewidget.cpp timelinewidget.h ) # Do the file comparison at the end, due to all the extend_qtc_plugin calls diff --git a/src/plugins/qmljstools/CMakeLists.txt b/src/plugins/qmljstools/CMakeLists.txt index 675ed50e51..bdfcb519ff 100644 --- a/src/plugins/qmljstools/CMakeLists.txt +++ b/src/plugins/qmljstools/CMakeLists.txt @@ -20,6 +20,7 @@ add_qtc_plugin(QmlJSTools qmljstoolssettings.cpp qmljstoolssettings.h ) -if (WITH_TESTS) - target_sources(QmlJSTools PRIVATE qmljstools_test.cpp) -endif() +extend_qtc_plugin(QmlJSTools + CONDITION WITH_TESTS + SOURCES qmljstools_test.cpp +) diff --git a/src/plugins/qmlpreview/CMakeLists.txt b/src/plugins/qmlpreview/CMakeLists.txt index 04cb414e46..1788cb3847 100644 --- a/src/plugins/qmlpreview/CMakeLists.txt +++ b/src/plugins/qmlpreview/CMakeLists.txt @@ -10,9 +10,9 @@ add_qtc_plugin(QmlPreview qmlpreview_global.h ) -if (WITH_TESTS) - target_sources(QmlPreview PRIVATE +extend_qtc_plugin(QmlPreview + CONDITION WITH_TESTS + SOURCES tests/qmlpreviewclient_test.cpp tests/qmlpreviewclient_test.h tests/qmlpreviewplugin_test.cpp tests/qmlpreviewplugin_test.h - ) -endif() +) diff --git a/src/plugins/qmlprofiler/CMakeLists.txt b/src/plugins/qmlprofiler/CMakeLists.txt index ab8ddb712c..63df2d6a01 100644 --- a/src/plugins/qmlprofiler/CMakeLists.txt +++ b/src/plugins/qmlprofiler/CMakeLists.txt @@ -47,8 +47,9 @@ add_qtc_plugin(QmlProfiler scenegraphtimelinemodel.cpp scenegraphtimelinemodel.h ) -if (WITH_TESTS) - target_sources(QmlProfiler PRIVATE +extend_qtc_plugin(QmlProfiler + CONDITION WITH_TESTS + SOURCES tests/debugmessagesmodel_test.cpp tests/debugmessagesmodel_test.h tests/fakedebugserver.cpp tests/fakedebugserver.h tests/flamegraphmodel_test.cpp tests/flamegraphmodel_test.h @@ -71,5 +72,4 @@ if (WITH_TESTS) tests/qmlprofilertraceclient_test.cpp tests/qmlprofilertraceclient_test.h tests/qmlprofilertraceview_test.cpp tests/qmlprofilertraceview_test.h tests/tests.qrc - ) -endif() +) diff --git a/src/plugins/texteditor/CMakeLists.txt b/src/plugins/texteditor/CMakeLists.txt index 83f7283ede..23145ac72e 100644 --- a/src/plugins/texteditor/CMakeLists.txt +++ b/src/plugins/texteditor/CMakeLists.txt @@ -102,6 +102,7 @@ add_qtc_plugin(TextEditor typingsettings.cpp typingsettings.h ) -if (WITH_TESTS) - target_sources(TextEditor PRIVATE texteditor_test.cpp) -endif() +extend_qtc_plugin(TextEditor + CONDITION WITH_TESTS + SOURCES texteditor_test.cpp +) diff --git a/src/plugins/valgrind/CMakeLists.txt b/src/plugins/valgrind/CMakeLists.txt index 96534f256a..fe8452d812 100644 --- a/src/plugins/valgrind/CMakeLists.txt +++ b/src/plugins/valgrind/CMakeLists.txt @@ -45,19 +45,19 @@ add_qtc_plugin(Valgrind xmlprotocol/threadedparser.cpp xmlprotocol/threadedparser.h ) -if (WIN32) - target_compile_definitions(Valgrind PRIVATE UNICODE _UNICODE) -endif() +extend_qtc_plugin(Valgrind + CONDITION WIN32 + DEFINES UNICODE _UNICODE +) -if (WITH_TESTS) - target_sources(Valgrind PRIVATE +extend_qtc_plugin(Valgrind + CONDITION WITH_TESTS + SOURCES valgrindmemcheckparsertest.cpp valgrindmemcheckparsertest.h valgrindtestrunnertest.cpp valgrindtestrunnertest.h - ) - target_compile_definitions(Valgrind PRIVATE + DEFINES PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/unit_testdata" VALGRIND_FAKE_PATH="${PROJECT_SOURCE_DIR}/src/tools/valgrindfake" TESTRUNNER_SRC_DIR="${PROJECT_SOURCE_DIR}/tests/auto/valgrind/memcheck/testapps" TESTRUNNER_APP_DIR="${PROJECT_BINARY_DIR}/tests/auto/valgrind/memcheck/testapps" - ) -endif() +) diff --git a/src/plugins/vcsbase/CMakeLists.txt b/src/plugins/vcsbase/CMakeLists.txt index aa1b511d26..b6d234b4f2 100644 --- a/src/plugins/vcsbase/CMakeLists.txt +++ b/src/plugins/vcsbase/CMakeLists.txt @@ -33,6 +33,7 @@ add_qtc_plugin(VcsBase wizard/vcsjsextension.cpp wizard/vcsjsextension.h ) -if (WITH_TESTS) - target_compile_definitions(VcsBase PRIVATE SRC_DIR="${IDE_SOURCE_TREE}") -endif() +extend_qtc_plugin(VcsBase + CONDITION WITH_TESTS + DEFINES SRC_DIR="${IDE_SOURCE_TREE}" +) |