From eaf0b0b2441753edfed75c3a3288462b987af941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 5 Jan 2018 09:49:49 +0100 Subject: [PATCH] don't recognize type dependency as fulfilled when type plugin is in source tree but not built (e.g. type plugin misses dependencies) (Thanks to Matthias Moeller for the Patch) --- cmake/plugin.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index c8a8c710..5e6b1684 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -329,7 +329,7 @@ macro (_check_plugin_deps _prefix _optional ) if ( DEFINED ${_prefix}_TYPES ) foreach (_TYPE ${${_prefix}_TYPES}) - if ( DEFINED ${_TYPE}_INCLUDE ) + if ( TARGET ${_TYPE} ) list(APPEND ${_prefix}_TYPE_INCLUDES "${${_TYPE}_INCLUDE}") list(APPEND ${_prefix}_TYPE_DEPENDENCIES "${_TYPE}") list(APPEND ${_prefix}_TYPE_DEFINITIONS "-DENABLE_${_TYPE}_SUPPORT") @@ -348,12 +348,12 @@ macro (_check_plugin_deps _prefix _optional ) foreach (_TYPE ${${_prefix}_OPT_TYPES}) - if ( DEFINED ${_TYPE}_INCLUDE ) + if ( TARGET ${_TYPE} ) list(APPEND ${_prefix}_TYPE_INCLUDES "${${_TYPE}_INCLUDE}") list(APPEND ${_prefix}_TYPE_DEPENDENCIES "${_TYPE}") list(APPEND ${_prefix}_TYPE_DEFINITIONS "-DENABLE_${_TYPE}_SUPPORT") else() - message(warning "Optional Datatype ${_TYPE} not available, proceeding without it") + message("Optional Datatype ${_TYPE} not available, proceeding without it") endif() endforeach() -- GitLab