From 85d0f8de7e44ddb4b9a788347079e76d16a19f21 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 26 Feb 2014 11:41:35 +0000 Subject: find_dependency: use correct version variable name The code set cmake_fd_version, but used ${version}. --- Modules/CMakeFindDependencyMacro.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index 08c4990c2a..cf0206b67e 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} -- cgit v1.2.1 From 3d8f7102bb8335f090f12ced25572df799448ca6 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 26 Feb 2014 11:41:48 +0000 Subject: find_dependency: unset cmake_fd_version variable at end of macro This matches the other macro variables. --- Modules/CMakeFindDependencyMacro.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index cf0206b67e..9334ba36cd 100644 --- a/Modules/CMakeFindDependencyMacro.cmake +++ b/Modules/CMakeFindDependencyMacro.cmake @@ -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) -- cgit v1.2.1