Skip to content
Snippets Groups Projects
Commit 0429e6da authored by Lars Bilke's avatar Lars Bilke
Browse files

Added option KEEP_RPATHS to conan_cmake_run()

parent dfb37df8
No related branches found
No related tags found
No related merge requests found
...@@ -200,7 +200,7 @@ endfunction() ...@@ -200,7 +200,7 @@ endfunction()
macro(parse_arguments) macro(parse_arguments)
set(options BASIC_SETUP CMAKE_TARGETS UPDATE) set(options BASIC_SETUP CMAKE_TARGETS UPDATE KEEP_RPATHS)
set(oneValueArgs CONANFILE) set(oneValueArgs CONANFILE)
set(multiValueArgs REQUIRES OPTIONS IMPORTS BUILD CONAN_COMMAND) set(multiValueArgs REQUIRES OPTIONS IMPORTS BUILD CONAN_COMMAND)
cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
...@@ -328,9 +328,17 @@ macro(conan_cmake_run) ...@@ -328,9 +328,17 @@ macro(conan_cmake_run)
if(ARGUMENTS_BASIC_SETUP) if(ARGUMENTS_BASIC_SETUP)
if(ARGUMENTS_CMAKE_TARGETS) 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() else()
conan_basic_setup() if(ARGUMENTS_KEEP_RPATHS)
conan_basic_setup(KEEP_RPATHS)
else()
conan_basic_setup()
endif()
endif() endif()
endif() endif()
endmacro() endmacro()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment