From 43facbe090ecd2bc61f89b5f017d172f6d254c11 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Oct 2020 09:26:06 +0100 Subject: Revert "cmake build: Disable clangpchmanagerbackend and refactoringbackend" The change breaks the dev package: The imported target "QtCreator::clangrefactoringbackend_lib" references the file "/home/qt/work/build/qtc_build/lib/qtcreator/libclangrefactoringbackend_lib.a" but this file does not exist. This reverts commit 20a620745982368f71ac890dedfde6429d9e4e84. Change-Id: I68f3b6948bde611b9e5b841d1fde2b136877cbfc Reviewed-by: Eike Ziller --- src/plugins/clangpchmanager/CMakeLists.txt | 3 ++- src/plugins/clangrefactoring/CMakeLists.txt | 3 ++- src/tools/clangpchmanagerbackend/CMakeLists.txt | 1 - src/tools/clangrefactoringbackend/CMakeLists.txt | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/clangpchmanager/CMakeLists.txt b/src/plugins/clangpchmanager/CMakeLists.txt index bae46003fa..c1c9b29f93 100644 --- a/src/plugins/clangpchmanager/CMakeLists.txt +++ b/src/plugins/clangpchmanager/CMakeLists.txt @@ -1,5 +1,6 @@ add_qtc_plugin(ClangPchManager - CONDITION TARGET libclang AND TARGET clangpchmanagerbackend + BUILD_DEFAULT OFF + CONDITION TARGET libclang DEPENDS ClangSupport CPlusPlus DEFINES CLANGPCHMANAGER_LIB PLUGIN_DEPENDS Core CppTools diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt index 6caa24247e..95c926dc2d 100644 --- a/src/plugins/clangrefactoring/CMakeLists.txt +++ b/src/plugins/clangrefactoring/CMakeLists.txt @@ -1,5 +1,6 @@ add_qtc_plugin(ClangRefactoring - CONDITION TARGET libclang AND TARGET clangrefactoringbackend + BUILD_DEFAULT OFF + CONDITION TARGET libclang DEPENDS ClangSupport CPlusPlus PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager SOURCES ${TEST_SOURCES} diff --git a/src/tools/clangpchmanagerbackend/CMakeLists.txt b/src/tools/clangpchmanagerbackend/CMakeLists.txt index cd5fbb72a5..cdbc111bab 100644 --- a/src/tools/clangpchmanagerbackend/CMakeLists.txt +++ b/src/tools/clangpchmanagerbackend/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(source) add_qtc_executable(clangpchmanagerbackend - BUILD_DEFAULT OFF DEPENDS clangrefactoringbackend_lib clangpchmanagerbackend_lib Sqlite ClangSupport diff --git a/src/tools/clangrefactoringbackend/CMakeLists.txt b/src/tools/clangrefactoringbackend/CMakeLists.txt index f32a22c25b..fdf1011cba 100644 --- a/src/tools/clangrefactoringbackend/CMakeLists.txt +++ b/src/tools/clangrefactoringbackend/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(source) add_qtc_executable(clangrefactoringbackend - BUILD_DEFAULT OFF DEPENDS clangrefactoringbackend_lib Sqlite ClangSupport SOURCES -- cgit v1.2.1