mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-13 08:41:16 +00:00
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.
This commit is contained in:
parent
7c185ac4a5
commit
afadb2a078
|
@ -375,18 +375,18 @@ macro(find_package2 qualifier pkgname)
|
||||||
if(${pkgname}_FOUND)
|
if(${pkgname}_FOUND)
|
||||||
if(${qualifier} STREQUAL PRIVATE)
|
if(${qualifier} STREQUAL PRIVATE)
|
||||||
set(PROJECT_${pkgname}_VERSION ${__version__})
|
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_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
|
||||||
elseif(${qualifier} STREQUAL PUBLIC)
|
elseif(${qualifier} STREQUAL PUBLIC)
|
||||||
set(PROJECT_${pkgname}_VERSION ${__version__})
|
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_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
|
||||||
set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
|
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})
|
set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
|
||||||
elseif(${qualifier} STREQUAL INTERFACE)
|
elseif(${qualifier} STREQUAL INTERFACE)
|
||||||
set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
|
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})
|
set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user