diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-23 09:07:52 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-23 10:03:37 +0000 |
| commit | 49626f7ea9085d167ea822b5fda6170e3949a1fc (patch) | |
| tree | d938241f9cccef6403b12ecfa0c5dba5bf749cef | |
| parent | 43454c3fcd7ea1635411805eec239e3f4ad43b58 (diff) | |
CMake build: Fix devel package issues
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>
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 6 | ||||
| -rw-r--r-- | src/libs/qmljs/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/CMakeLists.txt | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 82f7897b6d..993102e139 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -229,7 +229,11 @@ function(set_public_includes target includes) if (NOT IS_ABSOLUTE ${inc_dir}) set(inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${inc_dir}") 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() endfunction() diff --git a/src/libs/qmljs/CMakeLists.txt b/src/libs/qmljs/CMakeLists.txt index 2c05b662c3..243966afda 100644 --- a/src/libs/qmljs/CMakeLists.txt +++ b/src/libs/qmljs/CMakeLists.txt @@ -7,6 +7,7 @@ add_qtc_library(QmlJS parser/qmljsast.cpp parser/qmljsast_p.h parser/qmljsastfwd_p.h parser/qmljsastvisitor.cpp parser/qmljsastvisitor_p.h + parser/qmljsdiagnosticmessage_p.h parser/qmljsengine_p.cpp parser/qmljsengine_p.h parser/qmljsglobal_p.h parser/qmljsgrammar.cpp parser/qmljsgrammar_p.h diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 42feb7c13f..75a8571b81 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -144,6 +144,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/interfaces + PUBLIC_INCLUDES ../../../share/qtcreator/qml/qmlpuppet/interfaces SOURCES nodeinstanceserverinterface.cpp commondefines.h @@ -202,6 +203,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components/formeditor + PUBLIC_INCLUDES components/formeditor SOURCES abstractcustomtool.cpp abstractcustomtool.h abstractformeditortool.cpp abstractformeditortool.h @@ -257,6 +259,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components/integration + PUBLIC_INCLUDES components/integration SOURCES componentaction.cpp componentaction.h componentview.cpp componentview.h @@ -470,6 +473,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX designercore + PUBLIC_INCLUDES designercore SOURCES metainfo/itemlibraryinfo.cpp metainfo/metainfo.cpp |