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

Revert "cmake build: Disable clangpchmanagerbackend and refactoringbackend"

Browse Source 
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 20a6207459.

Change-Id: I68f3b6948bde611b9e5b841d1fde2b136877cbfc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2020-10-27 09:26:06 +01:00
parent 0f02fd7c87
commit 43facbe090
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorAPI.cmake
View File

@@ -541,7 +541,7 @@ endfunction()
function(add_qtc_executable name) function(add_qtc_executable name)
cmake_parse_arguments(_arg "SKIP_INSTALL;SKIP_TRANSLATION;ALLOW_ASCII_CASTS" cmake_parse_arguments(_arg "SKIP_INSTALL;SKIP_TRANSLATION;ALLOW_ASCII_CASTS"
"DESTINATION;COMPONENT;BUILD_DEFAULT" "DESTINATION;COMPONENT"
"DEPENDS;DEFINES;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN}) "DEPENDS;DEFINES;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN})
if ($_arg_UNPARSED_ARGUMENTS) if ($_arg_UNPARSED_ARGUMENTS)
@@ -556,11 +556,7 @@ function(add_qtc_executable name)
update_cached_list(__QTC_EXECUTABLES "${name}") update_cached_list(__QTC_EXECUTABLES "${name}")
string(TOUPPER "BUILD_EXECUTABLE_${name}" _build_executable_var) string(TOUPPER "BUILD_EXECUTABLE_${name}" _build_executable_var)
if (DEFINED _arg_BUILD_DEFAULT)
set(_build_executable_default ${_arg_BUILD_DEFAULT})
else()
set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT}) set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT})
endif()
if (DEFINED ENV{QTC_${_build_executable_var}}) if (DEFINED ENV{QTC_${_build_executable_var}})
set(_build_executable_default "$ENV{QTC_${_build_executable_var}}") set(_build_executable_default "$ENV{QTC_${_build_executable_var}}")
endif() endif()

3
src/plugins/clangpchmanager/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
add_qtc_plugin(ClangPchManager add_qtc_plugin(ClangPchManager
CONDITION TARGET libclang AND TARGET clangpchmanagerbackend BUILD_DEFAULT OFF
CONDITION TARGET libclang
DEPENDS ClangSupport CPlusPlus DEPENDS ClangSupport CPlusPlus
DEFINES CLANGPCHMANAGER_LIB DEFINES CLANGPCHMANAGER_LIB
PLUGIN_DEPENDS Core CppTools PLUGIN_DEPENDS Core CppTools

3
src/plugins/clangrefactoring/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
add_qtc_plugin(ClangRefactoring add_qtc_plugin(ClangRefactoring
CONDITION TARGET libclang AND TARGET clangrefactoringbackend BUILD_DEFAULT OFF
CONDITION TARGET libclang
DEPENDS ClangSupport CPlusPlus DEPENDS ClangSupport CPlusPlus
PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager
SOURCES ${TEST_SOURCES} SOURCES ${TEST_SOURCES}

1
src/tools/clangpchmanagerbackend/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
add_subdirectory(source) add_subdirectory(source)
add_qtc_executable(clangpchmanagerbackend add_qtc_executable(clangpchmanagerbackend
BUILD_DEFAULT OFF
DEPENDS DEPENDS
clangrefactoringbackend_lib clangpchmanagerbackend_lib clangrefactoringbackend_lib clangpchmanagerbackend_lib
Sqlite ClangSupport Sqlite ClangSupport

1
src/tools/clangrefactoringbackend/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
add_subdirectory(source) add_subdirectory(source)
add_qtc_executable(clangrefactoringbackend add_qtc_executable(clangrefactoringbackend
BUILD_DEFAULT OFF
DEPENDS DEPENDS
clangrefactoringbackend_lib Sqlite ClangSupport clangrefactoringbackend_lib Sqlite ClangSupport
SOURCES SOURCES