From 1faea1d73d64c8b07f438742ebadd8e0205410a2 Mon Sep 17 00:00:00 2001 From: Dominik Charousset Date: Tue, 15 Dec 2020 12:14:23 +0100 Subject: [PATCH] Remove explicit use of config mode for finding CAF --- CMakeLists.txt | 4 ++-- auxil/broker | 2 +- cmake | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6129b550ab..311c38c799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,11 +314,11 @@ endif () if ( CAF_ROOT OR BROKER_ROOT_DIR ) # TODO: drop < 3.12 compatibility check when raising the minimum CMake version if ( CAF_ROOT AND CMAKE_VERSION VERSION_LESS 3.12 ) - find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED CONFIG + find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED COMPONENTS openssl test io core PATHS "${CAF_ROOT}") else () - find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED CONFIG + find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED COMPONENTS openssl test io core) endif () message(STATUS "Using system CAF version ${CAF_VERSION}") diff --git a/auxil/broker b/auxil/broker index e8de3de783..617611a053 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit e8de3de783f6d8f7e36eeb6c32c5f30dcf16087c +Subproject commit 617611a053cba5ce2c40fe7286e8ea183d7b0f7f diff --git a/cmake b/cmake index 40251ae850..eeae54e767 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 40251ae850dee52eae8eb05e552c165e2deef354 +Subproject commit eeae54e7678706d012b09e31a3ef046dad8ef183