From 5122ae36258697b41a708e22b24525c1c492d71c Mon Sep 17 00:00:00 2001 From: Martin Hierholzer <martin.hierholzer@desy.de> Date: Mon, 12 Dec 2016 10:54:56 +0100 Subject: [PATCH] also export the LIBRARY_DIRS variable to the calling CMakeLists.txt (needed to publish it to further downstream dependencies) --- cmake/add_dependency.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/add_dependency.cmake b/cmake/add_dependency.cmake index fcbecdf..96f116e 100644 --- a/cmake/add_dependency.cmake +++ b/cmake/add_dependency.cmake @@ -38,9 +38,10 @@ FUNCTION(add_dependency dependency_project_name required_version) link_directories(${${dependency_project_name}_LIBRARY_DIR}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dependency_project_name}_CXX_FLAGS}" PARENT_SCOPE) SET(${dependency_project_name}_LIBRARIES ${${dependency_project_name}_LIBRARIES} PARENT_SCOPE) + SET(${dependency_project_name}_LIBRARY_DIRS "${${dependency_project_name}_LIBRARY_DIRS} ${${dependency_project_name}_LIBRARY_DIR}" PARENT_SCOPE) SET(${dependency_project_name}_LINKER_FLAGS "${${dependency_project_name}_LINKER_FLAGS} ${${dependency_project_name}_LINK_FLAGS}" PARENT_SCOPE) SET(${dependency_project_name}_LINK_FLAGS "${${dependency_project_name}_LINKER_FLAGS} ${${dependency_project_name}_LINK_FLAGS}" PARENT_SCOPE) - SET(${dependency_project_name}_CXX_FLAGS ${${dependency_project_name}_CXX_FLAGS} PARENT_SCOPE) + SET(${dependency_project_name}_CXX_FLAGS "${${dependency_project_name}_CXX_FLAGS}" PARENT_SCOPE) SET(${dependency_project_name}_FOUND ${${dependency_project_name}_FOUND} PARENT_SCOPE) ENDFUNCTION(add_dependency) -- GitLab