diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 2e1183c75ed..ee7b61f1f9c 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"
+    "DESTINATION;COMPONENT;BUILD_DEFAULT"
     "DEPENDS;DEFINES;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN})
 
   if ($_arg_UNPARSED_ARGUMENTS)
@@ -556,7 +556,11 @@ function(add_qtc_executable name)
   update_cached_list(__QTC_EXECUTABLES "${name}")
 
   string(TOUPPER "BUILD_EXECUTABLE_${name}" _build_executable_var)
-  set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT})
+  if (DEFINED _arg_BUILD_DEFAULT)
+    set(_build_executable_default ${_arg_BUILD_DEFAULT})
+  else()
+    set(_build_executable_default ${BUILD_EXECUTABLES_BY_DEFAULT})
+  endif()
   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 c1c9b29f93c..bae46003faf 100644
--- a/src/plugins/clangpchmanager/CMakeLists.txt
+++ b/src/plugins/clangpchmanager/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_qtc_plugin(ClangPchManager
-  BUILD_DEFAULT OFF
-  CONDITION TARGET libclang
+  CONDITION TARGET libclang AND TARGET clangpchmanagerbackend
   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 95c926dc2d0..6caa24247e0 100644
--- a/src/plugins/clangrefactoring/CMakeLists.txt
+++ b/src/plugins/clangrefactoring/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_qtc_plugin(ClangRefactoring
-  BUILD_DEFAULT OFF
-  CONDITION TARGET libclang
+  CONDITION TARGET libclang AND TARGET clangrefactoringbackend
   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 cdbc111bab1..cd5fbb72a50 100644
--- a/src/tools/clangpchmanagerbackend/CMakeLists.txt
+++ b/src/tools/clangpchmanagerbackend/CMakeLists.txt
@@ -1,6 +1,7 @@
 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 fdf1011cba2..f32a22c25b9 100644
--- a/src/tools/clangrefactoringbackend/CMakeLists.txt
+++ b/src/tools/clangrefactoringbackend/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(source)
 
 add_qtc_executable(clangrefactoringbackend
+  BUILD_DEFAULT OFF
   DEPENDS
     clangrefactoringbackend_lib Sqlite ClangSupport
   SOURCES