diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fb6d40f541016a4098eb2893e128c6c83354fb8..eda3f9aab7e29529a3d67865df3dde6efa7c6013 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ ENDIF() ########################################### message(STATUS "Build directory ${CMAKE_BINARY_DIR}") include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() +conan_basic_setup(KEEP_RPATHS) # fix grpc - remove unsecure (no-op ssl implementations) string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_LIBS_GRPC diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index d9ed76ec3cbb672e838dff60b06c408a0308fbb7..6e0db0446b0d4a2e1767f1ecdf2156ffb5dbb295 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -14,7 +14,7 @@ set(test_cases # dependencies include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() +conan_basic_setup(KEEP_RPATHS) # supress warnings during build of gtest cmake_policy(SET CMP0054 NEW)