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

CMake build: Fix devel package issues

Browse Source 
Include paths and headers were missing for building a separator
Qt Quick Designer plugin.

Task-number: QTCREATORBUG-23778
Change-Id: Ib6ba96ad42a8b2b36e0ee2f0e3c51c27f3365d37
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-04-23 09:07:52 +02:00
parent 43454c3fcd
commit 49626f7ea9
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorAPI.cmake
View File

@@ -229,7 +229,11 @@ function(set_public_includes target includes)
if (NOT IS_ABSOLUTE ${inc_dir}) if (NOT IS_ABSOLUTE ${inc_dir})
set(inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${inc_dir}") set(inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${inc_dir}")
endif() endif()
target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${inc_dir}>) file(RELATIVE_PATH include_dir_relative_path ${PROJECT_SOURCE_DIR} ${inc_dir})
target_include_directories(${target} PUBLIC
$<BUILD_INTERFACE:${inc_dir}>
$<INSTALL_INTERFACE:include/${include_dir_relative_path}>
)
endforeach() endforeach()
endfunction() endfunction()

1
src/libs/qmljs/CMakeLists.txt
View File

@@ -7,6 +7,7 @@ add_qtc_library(QmlJS
parser/qmljsast.cpp parser/qmljsast_p.h parser/qmljsast.cpp parser/qmljsast_p.h
parser/qmljsastfwd_p.h parser/qmljsastfwd_p.h
parser/qmljsastvisitor.cpp parser/qmljsastvisitor_p.h parser/qmljsastvisitor.cpp parser/qmljsastvisitor_p.h
parser/qmljsdiagnosticmessage_p.h
parser/qmljsengine_p.cpp parser/qmljsengine_p.h parser/qmljsengine_p.cpp parser/qmljsengine_p.h
parser/qmljsglobal_p.h parser/qmljsglobal_p.h
parser/qmljsgrammar.cpp parser/qmljsgrammar_p.h parser/qmljsgrammar.cpp parser/qmljsgrammar_p.h

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

@@ -144,6 +144,7 @@ extend_qtc_plugin(QmlDesigner
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/interfaces SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/interfaces
PUBLIC_INCLUDES ../../../share/qtcreator/qml/qmlpuppet/interfaces
SOURCES SOURCES
nodeinstanceserverinterface.cpp nodeinstanceserverinterface.cpp
commondefines.h commondefines.h
@@ -202,6 +203,7 @@ extend_qtc_plugin(QmlDesigner
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX components/formeditor SOURCES_PREFIX components/formeditor
PUBLIC_INCLUDES components/formeditor
SOURCES SOURCES
abstractcustomtool.cpp abstractcustomtool.h abstractcustomtool.cpp abstractcustomtool.h
abstractformeditortool.cpp abstractformeditortool.h abstractformeditortool.cpp abstractformeditortool.h
@@ -257,6 +259,7 @@ extend_qtc_plugin(QmlDesigner
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX components/integration SOURCES_PREFIX components/integration
PUBLIC_INCLUDES components/integration
SOURCES SOURCES
componentaction.cpp componentaction.h componentaction.cpp componentaction.h
componentview.cpp componentview.h componentview.cpp componentview.h
@@ -470,6 +473,7 @@ extend_qtc_plugin(QmlDesigner
extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner
SOURCES_PREFIX designercore SOURCES_PREFIX designercore
PUBLIC_INCLUDES designercore
SOURCES SOURCES
metainfo/itemlibraryinfo.cpp metainfo/itemlibraryinfo.cpp
metainfo/metainfo.cpp metainfo/metainfo.cpp