kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-find_dependency-EXACT' 

08ba128f find_dependency: Don't propagate EXACT argument.
This commit is contained in:
Brad King 2014-03-11 09:13:54 -04:00 committed by CMake Topic Stage
parent a2d63a9d04 08ba128f51
commit dfcacecd18
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/CMakeFindDependencyMacro.cmake
View File

@ -4,7 +4,7 @@
# #
# :: # ::
# #
# find_dependency(<dep> [<version>]) # find_dependency(<dep> [<version> [EXACT]])
# #
# #
# ``find_dependency()`` wraps a :command:`find_package` call for a package # ``find_dependency()`` wraps a :command:`find_package` call for a package
@ -34,9 +34,18 @@ macro(find_dependency dep)
set(cmake_fd_version ${ARGV1}) set(cmake_fd_version ${ARGV1})
endif() endif()
set(cmake_fd_exact_arg) set(cmake_fd_exact_arg)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT) if(${ARGC} GREATER 2)
if (NOT ${ARGV2} STREQUAL EXACT)
message(FATAL_ERROR "Invalid arguments to find_dependency")
endif()
if (NOT ${cmake_fd_version})
message(FATAL_ERROR "Invalid arguments to find_dependency. EXACT may only be specified if a VERSION is specified")
endif()
set(cmake_fd_exact_arg EXACT) set(cmake_fd_exact_arg EXACT)
endif() endif()
if(${ARGC} GREATER 3)
message(FATAL_ERROR "Invalid arguments to find_dependency")
endif()
set(cmake_fd_quiet_arg) set(cmake_fd_quiet_arg)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
set(cmake_fd_quiet_arg QUIET) set(cmake_fd_quiet_arg QUIET)