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

CMake: Fix compilation error when QmlPlugin is not built

Browse Source 
Ammends 6fe11f80d6

Change-Id: Ifa909d8e2946c4fdd8e2a5301bab2686a615d89a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Cristian Adam
2020-09-25 10:22:20 +02:00
committed by Cristian Adam
parent ac3337c557
commit 94008aa71e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorAPIInternal.cmake
View File

@@ -387,7 +387,7 @@ function(extend_qtc_target target_name)
cmake_parse_arguments(_arg cmake_parse_arguments(_arg
"" ""
"SOURCES_PREFIX;FEATURE_INFO" "SOURCES_PREFIX;FEATURE_INFO"
"CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS" "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES"
${ARGN} ${ARGN}
) )
@@ -456,4 +456,8 @@ function(extend_qtc_target target_name)
endforeach() endforeach()
append_extra_translations(${target_name} "${_arg_EXTRA_TRANSLATIONS}") append_extra_translations(${target_name} "${_arg_EXTRA_TRANSLATIONS}")
if (_arg_PROPERTIES)
set_target_properties(${target_name} PROPERTIES ${_arg_PROPERTIES})
endif()
endfunction() endfunction()

2
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -38,7 +38,7 @@ if (APPLE)
set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner") set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner")
endif() endif()
set_target_properties(QmlDesigner PROPERTIES QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}") extend_qtc_plugin(QmlDesigner PROPERTIES QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}")
add_qtc_plugin(assetexporterplugin add_qtc_plugin(assetexporterplugin
CONDITION TARGET QmlDesigner CONDITION TARGET QmlDesigner