From afadb2a078b8952ab58751b472eac081b76e486b Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 11 Oct 2018 18:58:53 +0200 Subject: [PATCH] Make find_package2 a bit smarter The VERSION arguments now supports multiple values and picks the highest version from the given. The COMPONENTS argument now automatically removes duplicates. --- cmake/FairMQLib.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/FairMQLib.cmake b/cmake/FairMQLib.cmake index 23283ed6..005150ad 100644 --- a/cmake/FairMQLib.cmake +++ b/cmake/FairMQLib.cmake @@ -375,18 +375,18 @@ macro(find_package2 qualifier pkgname) if(${pkgname}_FOUND) if(${qualifier} STREQUAL PRIVATE) set(PROJECT_${pkgname}_VERSION ${__version__}) - set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS}) + set(PROJECT_${pkgname}_COMPONENTS ${__components__}) set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname}) elseif(${qualifier} STREQUAL PUBLIC) set(PROJECT_${pkgname}_VERSION ${__version__}) - set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS}) + set(PROJECT_${pkgname}_COMPONENTS ${__components__}) set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname}) set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__}) - set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS}) + set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${__components__}) set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname}) elseif(${qualifier} STREQUAL INTERFACE) set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__}) - set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS}) + set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${__components__}) set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname}) endif() endif()