CMake: Apply new ADD_REQUIREMENTS_OF option

This commit is contained in:
Dennis Klein 2019-06-26 19:34:42 +02:00 committed by Dennis Klein
parent 187a821f36
commit a30a6955ef

View File

@ -63,8 +63,7 @@ if(BUILD_OFI_TRANSPORT)
VERSION 0.3.1 VERSION 0.3.1
) )
find_package2(PRIVATE OFI REQUIRED find_package2(PRIVATE OFI REQUIRED
VERSION ${asiofi_OFI_VERSION} ADD_REQUIREMENTS_OF asiofi
COMPONENTS ${asiofi_OFI_COMPONENTS}
) )
endif() endif()
@ -75,12 +74,24 @@ if(BUILD_NANOMSG_TRANSPORT)
endif() endif()
if(BUILD_DDS_PLUGIN) if(BUILD_DDS_PLUGIN)
find_package2(PRIVATE DDS REQUIRED
VERSION 2.4
)
set(DDS_Boost_COMPONENTS system log log_setup) set(DDS_Boost_COMPONENTS system log log_setup)
endif() endif()
if(BUILD_PMIX_PLUGIN)
find_package2(PRIVATE PMIx REQUIRED
VERSION 2.1.4
)
endif()
if(BUILD_FAIRMQ) if(BUILD_FAIRMQ)
find_package2(PUBLIC FairLogger REQUIRED
VERSION 1.2.0
)
find_package2(PUBLIC Boost REQUIRED find_package2(PUBLIC Boost REQUIRED
VERSION 1.64 ${asiofi_Boost_VERSION} VERSION 1.64
COMPONENTS COMPONENTS
container container
@ -88,25 +99,17 @@ if(BUILD_FAIRMQ)
filesystem filesystem
date_time date_time
regex regex
${asiofi_Boost_COMPONENTS}
${DDS_Boost_COMPONENTS} ADD_REQUIREMENTS_OF
) asiofi
find_package2(PUBLIC FairLogger REQUIRED DDS
VERSION 1.2.0 FairLogger
) )
find_package2(PRIVATE ZeroMQ REQUIRED find_package2(PRIVATE ZeroMQ REQUIRED
VERSION 4.1.5 VERSION 4.1.5
) )
endif() 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) if(BUILD_TESTING)
find_package2(PRIVATE GTest REQUIRED find_package2(PRIVATE GTest REQUIRED
VERSION 1.7.0 VERSION 1.7.0