From a30a6955efa60dbc627b07339e33d7d7569245a2 Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Wed, 26 Jun 2019 19:34:42 +0200
Subject: [PATCH] CMake: Apply new ADD_REQUIREMENTS_OF option

---
 CMakeLists.txt | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fa13e09..9c7e11df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,7 @@ if(BUILD_OFI_TRANSPORT)
     VERSION 0.3.1
   )
   find_package2(PRIVATE OFI REQUIRED
-    VERSION ${asiofi_OFI_VERSION}
-    COMPONENTS ${asiofi_OFI_COMPONENTS}
+    ADD_REQUIREMENTS_OF asiofi
   )
 endif()
 
@@ -75,12 +74,24 @@ if(BUILD_NANOMSG_TRANSPORT)
 endif()
 
 if(BUILD_DDS_PLUGIN)
+  find_package2(PRIVATE DDS REQUIRED
+    VERSION 2.4
+  )
   set(DDS_Boost_COMPONENTS system log log_setup)
 endif()
 
+if(BUILD_PMIX_PLUGIN)
+  find_package2(PRIVATE PMIx REQUIRED
+    VERSION 2.1.4
+  )
+endif()
+
 if(BUILD_FAIRMQ)
+  find_package2(PUBLIC FairLogger REQUIRED
+    VERSION 1.2.0
+  )
   find_package2(PUBLIC Boost REQUIRED
-    VERSION 1.64 ${asiofi_Boost_VERSION}
+    VERSION 1.64
 
     COMPONENTS
     container
@@ -88,25 +99,17 @@ if(BUILD_FAIRMQ)
     filesystem
     date_time
     regex
-    ${asiofi_Boost_COMPONENTS}
-    ${DDS_Boost_COMPONENTS}
-  )
-  find_package2(PUBLIC FairLogger REQUIRED
-    VERSION 1.2.0
+
+    ADD_REQUIREMENTS_OF
+    asiofi
+    DDS
+    FairLogger
   )
   find_package2(PRIVATE ZeroMQ REQUIRED
     VERSION 4.1.5
   )
 endif()
 
-if(BUILD_DDS_PLUGIN)
-  find_package2(PRIVATE DDS VERSION 2.4 REQUIRED)
-endif()
-
-if(BUILD_PMIX_PLUGIN)
-  find_package2(PRIVATE PMIx VERSION 2.1.4 REQUIRED)
-endif()
-
 if(BUILD_TESTING)
   find_package2(PRIVATE GTest REQUIRED
     VERSION 1.7.0