diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-26 10:31:45 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-26 10:31:45 -0500 |
| commit | 6391b32a32c27e136eb629f633893f9a69e98182 (patch) | |
| tree | 61a50a7300b0bdb689e80694571ea02a99c46ee2 /Modules | |
| parent | 14170273fe9df493fa3d0867d980889d6d08e089 (diff) | |
| parent | 3d8f7102bb8335f090f12ced25572df799448ca6 (diff) | |
| download | cmake-6391b32a32c27e136eb629f633893f9a69e98182.tar.gz | |
Merge topic 'fix-find_dependency-macro'
3d8f7102 find_dependency: unset cmake_fd_version variable at end of macro
85d0f8de find_dependency: use correct version variable name
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeFindDependencyMacro.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index 08c4990c2a..9334ba36cd 100644 --- a/Modules/CMakeFindDependencyMacro.cmake +++ b/Modules/CMakeFindDependencyMacro.cmake @@ -50,7 +50,7 @@ macro(find_dependency dep) _CMAKE_${dep}_TRANSITIVE_DEPENDENCY ) - find_package(${dep} ${version} + find_package(${dep} ${cmake_fd_version} ${cmake_fd_exact_arg} ${cmake_fd_quiet_arg} ${cmake_fd_required_arg} @@ -65,6 +65,7 @@ macro(find_dependency dep) set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False) return() endif() + set(cmake_fd_version) set(cmake_fd_required_arg) set(cmake_fd_quiet_arg) set(cmake_fd_exact_arg) |