From 9989406106e48e0405a43289112f5c70d8f2beed Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 28 May 2019 12:03:24 +0200
Subject: [PATCH] CMake build: Fix qtc_extend_plugin if plugin is disabled by
 CONDITION

It should be a no-op in that case, but still error if the plugin target
name passed to qtc_extend_plugin is wrong.

Change-Id: I97579e658d4b42108fbc2600aad550c6a7b7f11b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/CMakeLists.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f70eb8dc187..0a8825990a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -193,8 +193,14 @@ function(find_dependent_plugins varName)
 endfunction()
 
 function(qtc_plugin_enabled varName name)
-  string(TOUPPER "BUILD_PLUGIN_${name}" _build_plugin_var)
-  set(${varName} ${${_build_plugin_var}} PARENT_SCOPE)
+  if (NOT (name IN_LIST __QTC_PLUGINS))
+    message(FATAL_ERROR "extend_qtc_plugin: Unknown plugin target \"${name}\"")
+  endif()
+  if (TARGET ${name})
+    set(${varName} ON PARENT_SCOPE)
+  else()
+    set(${varName} OFF PARENT_SCOPE)
+  endif()
 endfunction()
 
 function(add_qtc_plugin target_name)