From d061bd4d124643520f053d363ea46d4bf896c129 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Wed, 14 Sep 2016 18:16:43 +0200
Subject: [PATCH] fixed multiple components not properly being passed on to
find_package
---
cmake/add_dependency.cmake | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/cmake/add_dependency.cmake b/cmake/add_dependency.cmake
index c547715..ed3dbf4 100644
--- a/cmake/add_dependency.cmake
+++ b/cmake/add_dependency.cmake
@@ -26,13 +26,17 @@
#
#######################################################################################################################
-MACRO(add_dependency dependency_project_name required_version components)
-
+FUNCTION(add_dependency dependency_project_name required_version)
+ # collect additional arguments and put into the list of components
+ SET(components "")
+ foreach(arg IN LISTS ARGN)
+ SET(components ${components} ${arg})
+ endforeach()
FIND_PACKAGE(${dependency_project_name} ${required_version} COMPONENTS ${components})
include_directories(SYSTEM ${${dependency_project_name}_INCLUDE_DIRS} ${${dependency_project_name}_INCLUDE_DIR})
link_directories(${${dependency_project_name}_LIBRARY_DIRS})
link_directories(${${dependency_project_name}_LIBRARY_DIR})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dependency_project_name}_CXX_FLAGS}")
-ENDMACRO(add_dependency)
+ENDFUNCTION(add_dependency)
--
GitLab