From 8ae9cfe39d9fbf114f23bc00e7a66516c2429648 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 26 Jun 2019 17:51:06 +0200 Subject: CMake build: Add "Devel" package The "Devel" package will contain headers, libraries, documentation needed by the 3rd parties to build Qt Creator plugins. Fixes: QTCREATORBUG-22514 Change-Id: If54929f823982b921b98a63ff6085d53618a3a49 Reviewed-by: Eike Ziller --- tests/auto/algorithm/CMakeLists.txt | 2 +- tests/auto/debugger/CMakeLists.txt | 4 ++-- .../pluginmanager/circularplugins/CMakeLists.txt | 2 +- .../pluginmanager/correctplugins1/CMakeLists.txt | 2 +- .../auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt | 4 +++- tests/auto/externaltool/CMakeLists.txt | 4 ++-- tests/auto/json/CMakeLists.txt | 4 ++-- tests/auto/pointeralgorithm/CMakeLists.txt | 2 +- tests/auto/profilewriter/CMakeLists.txt | 2 +- tests/auto/qml/codemodel/check/CMakeLists.txt | 2 +- tests/auto/qml/codemodel/dependencies/CMakeLists.txt | 4 ++-- tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt | 4 ++-- tests/auto/qml/codemodel/importscheck/CMakeLists.txt | 4 ++-- tests/auto/qml/persistenttrie/CMakeLists.txt | 2 +- tests/auto/qml/qmldesigner/coretests/CMakeLists.txt | 10 +++++----- tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt | 2 +- tests/auto/qml/qmljssimplereader/CMakeLists.txt | 2 +- tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt | 4 ++-- tests/auto/qml/qrcparser/CMakeLists.txt | 2 +- tests/auto/qml/reformatter/CMakeLists.txt | 2 +- tests/auto/toolchaincache/CMakeLists.txt | 2 +- 21 files changed, 34 insertions(+), 32 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/algorithm/CMakeLists.txt b/tests/auto/algorithm/CMakeLists.txt index f856b34836..212c5ad32a 100644 --- a/tests/auto/algorithm/CMakeLists.txt +++ b/tests/auto/algorithm/CMakeLists.txt @@ -1,4 +1,4 @@ add_qtc_test(tst_algorithm - INCLUDES "${CMAKE_SOURCE_DIR}/src/libs" + INCLUDES "${PROJECT_SOURCE_DIR}/src/libs" SOURCES tst_algorithm.cpp ) diff --git a/tests/auto/debugger/CMakeLists.txt b/tests/auto/debugger/CMakeLists.txt index b4e7da69dc..c0b315d859 100644 --- a/tests/auto/debugger/CMakeLists.txt +++ b/tests/auto/debugger/CMakeLists.txt @@ -1,4 +1,4 @@ -set(DEBUGGERDIR "${CMAKE_SOURCE_DIR}/src/plugins/debugger") +set(DEBUGGERDIR "${PROJECT_SOURCE_DIR}/src/plugins/debugger") add_qtc_test(tst_debugger_disassembler INCLUDES "${DEBUGGERDIR}" @@ -10,7 +10,7 @@ add_qtc_test(tst_debugger_disassembler if (WITH_DEBUGGER_DUMPERS) add_qtc_test(tst_debugger_dumpers DEPENDS Qt5::Network Utils - DEFINES DUMPERDIR="${CMAKE_SOURCE_DIR}/share/qtcreator/debugger" + DEFINES DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger" INCLUDES "${DEBUGGERDIR}" SOURCES diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/CMakeLists.txt index bbf4a58ef9..29b93fe179 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/CMakeLists.txt @@ -1,4 +1,4 @@ -set(TEST_PLUGIN_PATH "${CMAKE_CURRENT_BINARY_DIR}") +file(RELATIVE_PATH TEST_PLUGIN_PATH ${QtCreator_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(plugin1) add_subdirectory(plugin2) add_subdirectory(plugin3) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/CMakeLists.txt index bbf4a58ef9..29b93fe179 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/CMakeLists.txt @@ -1,4 +1,4 @@ -set(TEST_PLUGIN_PATH "${CMAKE_CURRENT_BINARY_DIR}") +file(RELATIVE_PATH TEST_PLUGIN_PATH ${QtCreator_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(plugin1) add_subdirectory(plugin2) add_subdirectory(plugin3) diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt index df9fe19244..8bf159368b 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt @@ -7,12 +7,14 @@ else() set(plugin_output_name "testd4") endif() +file(RELATIVE_PATH TEST_PLUGIN_PATH ${QtCreator_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + add_qtc_plugin(testplugin DEPENDS ExtensionSystem DEFINES MYPLUGIN_LIBRARY SOURCES testplugin.cpp testplugin.h - PLUGIN_PATH "${CMAKE_CURRENT_BINARY_DIR}" + PLUGIN_PATH "${TEST_PLUGIN_PATH}" PROPERTIES OUTPUT_NAME ${plugin_output_name} SKIP_INSTALL diff --git a/tests/auto/externaltool/CMakeLists.txt b/tests/auto/externaltool/CMakeLists.txt index 64a6004150..944c3dc671 100644 --- a/tests/auto/externaltool/CMakeLists.txt +++ b/tests/auto/externaltool/CMakeLists.txt @@ -2,6 +2,6 @@ add_qtc_test(tst_externaltooltest DEPENDS Core app_version SOURCES tst_externaltooltest.cpp - "${CMAKE_SOURCE_DIR}/src/plugins/coreplugin/externaltool.cpp" - "${CMAKE_SOURCE_DIR}/src/plugins/coreplugin/externaltool.h" + "${PROJECT_SOURCE_DIR}/src/plugins/coreplugin/externaltool.cpp" + "${PROJECT_SOURCE_DIR}/src/plugins/coreplugin/externaltool.h" ) diff --git a/tests/auto/json/CMakeLists.txt b/tests/auto/json/CMakeLists.txt index e03addf91d..111a5ae4d9 100644 --- a/tests/auto/json/CMakeLists.txt +++ b/tests/auto/json/CMakeLists.txt @@ -1,7 +1,7 @@ add_qtc_test(tst_json DEPENDS Utils - INCLUDES "${CMAKE_SOURCE_DIR}/src/shared/json" + INCLUDES "${PROJECT_SOURCE_DIR}/src/shared/json" SOURCES tst_json.cpp - "${CMAKE_SOURCE_DIR}/src/shared/json/json.cpp" + "${PROJECT_SOURCE_DIR}/src/shared/json/json.cpp" ) diff --git a/tests/auto/pointeralgorithm/CMakeLists.txt b/tests/auto/pointeralgorithm/CMakeLists.txt index 52a8bbc499..bd1f61dd39 100644 --- a/tests/auto/pointeralgorithm/CMakeLists.txt +++ b/tests/auto/pointeralgorithm/CMakeLists.txt @@ -1,4 +1,4 @@ add_qtc_test(tst_pointeralgorithm - INCLUDES "${CMAKE_SOURCE_DIR}/src/libs" + INCLUDES "${PROJECT_SOURCE_DIR}/src/libs" SOURCES tst_pointeralgorithm.cpp ) diff --git a/tests/auto/profilewriter/CMakeLists.txt b/tests/auto/profilewriter/CMakeLists.txt index c929843c83..766fd2607b 100644 --- a/tests/auto/profilewriter/CMakeLists.txt +++ b/tests/auto/profilewriter/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_profilewriter DEPENDS Utils ProParser - INCLUDES "${CMAKE_SOURCE_DIR}/src/shared/proparser" + INCLUDES "${PROJECT_SOURCE_DIR}/src/shared/proparser" SOURCES tst_profilewriter.cpp ) diff --git a/tests/auto/qml/codemodel/check/CMakeLists.txt b/tests/auto/qml/codemodel/check/CMakeLists.txt index fdcd1334bd..c5d45604d2 100644 --- a/tests/auto/qml/codemodel/check/CMakeLists.txt +++ b/tests/auto/qml/codemodel/check/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_test(tst_qml_check DEPENDS qmljs DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_check.cpp ) diff --git a/tests/auto/qml/codemodel/dependencies/CMakeLists.txt b/tests/auto/qml/codemodel/dependencies/CMakeLists.txt index 544e771873..c602d7b60a 100644 --- a/tests/auto/qml/codemodel/dependencies/CMakeLists.txt +++ b/tests/auto/qml/codemodel/dependencies/CMakeLists.txt @@ -1,9 +1,9 @@ add_qtc_test(tst_qml_dependencies DEPENDS qmljs QmlJSTools ExtensionSystem Utils - INCLUDES "${CMAKE_SOURCE_DIR}/src/plugins" + INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_dependencies.cpp ) diff --git a/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt b/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt index 62a0ba588d..c6ec132307 100644 --- a/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt +++ b/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt @@ -1,9 +1,9 @@ add_qtc_test(tst_qml_ecmascript7 DEPENDS qmljs QmlJSTools ExtensionSystem Utils - INCLUDES "${CMAKE_SOURCE_DIR}/src/plugins" + INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_ecmascript7.cpp ) diff --git a/tests/auto/qml/codemodel/importscheck/CMakeLists.txt b/tests/auto/qml/codemodel/importscheck/CMakeLists.txt index 5f994a58ee..6da32f5703 100644 --- a/tests/auto/qml/codemodel/importscheck/CMakeLists.txt +++ b/tests/auto/qml/codemodel/importscheck/CMakeLists.txt @@ -1,9 +1,9 @@ add_qtc_test(tst_qml_importscheck DEPENDS qmljs QmlJSTools Utils CPlusPlus - INCLUDES "${CMAKE_SOURCE_DIR}/src/plugins" + INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_importscheck.cpp ) diff --git a/tests/auto/qml/persistenttrie/CMakeLists.txt b/tests/auto/qml/persistenttrie/CMakeLists.txt index 2ab22d0919..3053ea8487 100644 --- a/tests/auto/qml/persistenttrie/CMakeLists.txt +++ b/tests/auto/qml/persistenttrie/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_test(tst_qml_testtrie DEPENDS qmljs DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_testtrie.cpp ) diff --git a/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt b/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt index 3e83f280af..87842321db 100644 --- a/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt +++ b/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt @@ -4,13 +4,13 @@ return() add_qtc_test(tst_qml_testcore DEPENDS qmljs Utils QmlEditorWidgets CPlusPlus Core QmlJSEditor INCLUDES - "${CMAKE_SOURCE_DIR}/src/plugins/qmldesigner/designercore/include" - "${CMAKE_SOURCE_DIR}/src/plugins/qmldesigner/designercore" - "${CMAKE_SOURCE_DIR}/share/qtcreator/qml/qmlpuppet/interfaces" - "${CMAKE_SOURCE_DIR}/share/qtcreator/qml/qmlpuppet/types" + "${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore/include" + "${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore" + "${PROJECT_SOURCE_DIR}/share/qtcreator/qml/qmlpuppet/interfaces" + "${PROJECT_SOURCE_DIR}/share/qtcreator/qml/qmlpuppet/types" DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES ../data/testfiles.qrc diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt b/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt index d8daee0578..75506b8b27 100644 --- a/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt +++ b/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_test(tst_qml_qmlcodeformatter DEPENDS qmljs QmlJSTools TextEditor DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_qmlcodeformatter.cpp ) diff --git a/tests/auto/qml/qmljssimplereader/CMakeLists.txt b/tests/auto/qml/qmljssimplereader/CMakeLists.txt index 4742047d7b..e4f7ce9051 100644 --- a/tests/auto/qml/qmljssimplereader/CMakeLists.txt +++ b/tests/auto/qml/qmljssimplereader/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_test(tst_qml_qmljssimplereader DEPENDS qmljs DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_qmljssimplereader.cpp ) diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt b/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt index 5d7f7c79bf..71de601189 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt +++ b/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt @@ -1,13 +1,13 @@ get_target_property(QmlProjectManagerSources QmlProjectManager SOURCES) foreach(source IN LISTS QmlProjectManagerSources) if (source MATCHES "fileformat") - list(APPEND fileformat_sources "${CMAKE_SOURCE_DIR}/src/plugins/qmlprojectmanager/${source}") + list(APPEND fileformat_sources "${PROJECT_SOURCE_DIR}/src/plugins/qmlprojectmanager/${source}") endif() endforeach() add_qtc_test(tst_qml_fileformat DEPENDS qmljs Utils - INCLUDES "${CMAKE_SOURCE_DIR}/src/plugins/qmlprojectmanager/fileformat" + INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins/qmlprojectmanager/fileformat" DEFINES QT_CREATOR SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" diff --git a/tests/auto/qml/qrcparser/CMakeLists.txt b/tests/auto/qml/qrcparser/CMakeLists.txt index bcecb807e4..3bb82971d5 100644 --- a/tests/auto/qml/qrcparser/CMakeLists.txt +++ b/tests/auto/qml/qrcparser/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_test(tst_qml_qrcparser DEPENDS qmljs Utils DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_qrcparser.cpp ) diff --git a/tests/auto/qml/reformatter/CMakeLists.txt b/tests/auto/qml/reformatter/CMakeLists.txt index a9119ccd93..de63ba3e0c 100644 --- a/tests/auto/qml/reformatter/CMakeLists.txt +++ b/tests/auto/qml/reformatter/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_test(tst_qml_reformatter DEPENDS qmljs DEFINES QT_CREATOR - QTCREATORDIR="${CMAKE_SOURCE_DIR}" + QTCREATORDIR="${PROJECT_SOURCE_DIR}" TESTSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" SOURCES tst_reformatter.cpp ) diff --git a/tests/auto/toolchaincache/CMakeLists.txt b/tests/auto/toolchaincache/CMakeLists.txt index 5a2115f09b..3a0637c9fd 100644 --- a/tests/auto/toolchaincache/CMakeLists.txt +++ b/tests/auto/toolchaincache/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_toolchaincache DEPENDS ProjectExplorer Qt5::Gui - INCLUDES "${CMAKE_SOURCE_DIR}/src/libs" + INCLUDES "${PROJECT_SOURCE_DIR}/src/libs" SOURCES tst_toolchaincache.cpp ) -- cgit v1.2.3