From 7ef129d7086ae6a19d64036488cd4ea8af4e7c8c Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Fri, 22 Feb 2013 23:13:06 +0100 Subject: [PATCH] Allow optional packages in find-module package list --- cmake/Modules/OpmPackage.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake index 4fedbe5a..eec8c0fa 100644 --- a/cmake/Modules/OpmPackage.cmake +++ b/cmake/Modules/OpmPackage.cmake @@ -126,11 +126,15 @@ function (find_opm_package module deps header lib defs prog conf) set (${module}_INCLUDE_DIRS "${${module}_INCLUDE_DIR}") set (${module}_LIBRARIES "${${module}_LIBRARY}") foreach (_dep IN LISTS _deps) - list (APPEND ${module}_INCLUDE_DIRS ${${_dep}_INCLUDE_DIRS}) - list (APPEND ${module}_LIBRARIES ${${_dep}_LIBRARIES}) - list (APPEND ${module}_DEFINITIONS ${${_dep}_DEFINITIONS}) - list (APPEND ${module}_CONFIG_VARS ${${_dep}_CONFIG_VARS}) - list (APPEND ${module}_LINKER_FLAGS ${${_dep}_LINKER_FLAGS}) + # only add those packages we actually found (find_package will show + # an error if it was marked as REQUIRED) + if (${_dep}_FOUND) + list (APPEND ${module}_INCLUDE_DIRS ${${_dep}_INCLUDE_DIRS}) + list (APPEND ${module}_LIBRARIES ${${_dep}_LIBRARIES}) + list (APPEND ${module}_DEFINITIONS ${${_dep}_DEFINITIONS}) + list (APPEND ${module}_CONFIG_VARS ${${_dep}_CONFIG_VARS}) + list (APPEND ${module}_LINKER_FLAGS ${${_dep}_LINKER_FLAGS}) + endif (${_dep}_FOUND) endforeach (_dep) # compile with this option to avoid avalanche of warnings