From 0429e6dab8316dc26db7fc95e1d984eda89e9da5 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 5 Jan 2018 13:01:37 +0100
Subject: [PATCH] Added option KEEP_RPATHS to conan_cmake_run()
---
scripts/cmake/conan/conan.cmake | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/scripts/cmake/conan/conan.cmake b/scripts/cmake/conan/conan.cmake
index d492478a753..2a51d3ffb6c 100644
--- a/scripts/cmake/conan/conan.cmake
+++ b/scripts/cmake/conan/conan.cmake
@@ -200,7 +200,7 @@ endfunction()
macro(parse_arguments)
- set(options BASIC_SETUP CMAKE_TARGETS UPDATE)
+ set(options BASIC_SETUP CMAKE_TARGETS UPDATE KEEP_RPATHS)
set(oneValueArgs CONANFILE)
set(multiValueArgs REQUIRES OPTIONS IMPORTS BUILD CONAN_COMMAND)
cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -328,9 +328,17 @@ macro(conan_cmake_run)
if(ARGUMENTS_BASIC_SETUP)
if(ARGUMENTS_CMAKE_TARGETS)
- conan_basic_setup(TARGETS)
+ if(ARGUMENTS_KEEP_RPATHS)
+ conan_basic_setup(TARGETS KEEP_RPATHS)
+ else()
+ conan_basic_setup(TARGETS)
+ endif()
else()
- conan_basic_setup()
+ if(ARGUMENTS_KEEP_RPATHS)
+ conan_basic_setup(KEEP_RPATHS)
+ else()
+ conan_basic_setup()
+ endif()
endif()
endif()
endmacro()
--
GitLab