Merge branch 'fix-find_dependency-macro' into release
This commit is contained in:
commit
cf7677d0a7
|
@ -29,29 +29,34 @@
|
||||||
|
|
||||||
macro(find_dependency dep)
|
macro(find_dependency dep)
|
||||||
if (NOT ${dep}_FOUND)
|
if (NOT ${dep}_FOUND)
|
||||||
if (${ARGV1})
|
set(cmake_fd_version)
|
||||||
set(version ${ARGV1})
|
if (${ARGC} GREATER 1)
|
||||||
|
set(cmake_fd_version ${ARGV1})
|
||||||
endif()
|
endif()
|
||||||
set(exact_arg)
|
set(cmake_fd_exact_arg)
|
||||||
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
|
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
|
||||||
set(exact_arg EXACT)
|
set(cmake_fd_exact_arg EXACT)
|
||||||
endif()
|
endif()
|
||||||
set(quiet_arg)
|
set(cmake_fd_quiet_arg)
|
||||||
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
|
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
|
||||||
set(quiet_arg QUIET)
|
set(cmake_fd_quiet_arg QUIET)
|
||||||
endif()
|
endif()
|
||||||
set(required_arg)
|
set(cmake_fd_required_arg)
|
||||||
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
|
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
|
||||||
set(required_arg REQUIRED)
|
set(cmake_fd_required_arg REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
get_property(alreadyTransitive GLOBAL PROPERTY
|
get_property(cmake_fd_alreadyTransitive GLOBAL PROPERTY
|
||||||
_CMAKE_${dep}_TRANSITIVE_DEPENDENCY
|
_CMAKE_${dep}_TRANSITIVE_DEPENDENCY
|
||||||
)
|
)
|
||||||
|
|
||||||
find_package(${dep} ${version} ${exact_arg} ${quiet_arg} ${required_arg})
|
find_package(${dep} ${version}
|
||||||
|
${cmake_fd_exact_arg}
|
||||||
|
${cmake_fd_quiet_arg}
|
||||||
|
${cmake_fd_required_arg}
|
||||||
|
)
|
||||||
|
|
||||||
if(NOT DEFINED alreadyTransitive OR alreadyTransitive)
|
if(NOT DEFINED cmake_fd_alreadyTransitive OR cmake_fd_alreadyTransitive)
|
||||||
set_property(GLOBAL PROPERTY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY TRUE)
|
set_property(GLOBAL PROPERTY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -60,8 +65,8 @@ macro(find_dependency dep)
|
||||||
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False)
|
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
set(required_arg)
|
set(cmake_fd_required_arg)
|
||||||
set(quiet_arg)
|
set(cmake_fd_quiet_arg)
|
||||||
set(exact_arg)
|
set(cmake_fd_exact_arg)
|
||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
Loading…
Reference in New Issue