diff options
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 8 | ||||
| -rw-r--r-- | src/plugins/clangpchmanager/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/tools/clangpchmanagerbackend/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/tools/clangrefactoringbackend/CMakeLists.txt | 1 |
5 files changed, 6 insertions, 10 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 725af7134e..13d81a0a94 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -541,7 +541,7 @@ endfunction() function(add_qtc_executable name) 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}) if ($_arg_UNPARSED_ARGUMENTS) @@ -556,11 +556,7 @@ function(add_qtc_executable name) update_cached_list(__QTC_EXECUTABLES "${name}") 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}) - endif() + set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT}) if (DEFINED ENV{QTC_${_build_executable_var}}) set(_build_executable_default "$ENV{QTC_${_build_executable_var}}") endif() 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 |