Browse Source

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
Brad King 12 years ago
parent
commit
6391b32a32
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Modules/CMakeFindDependencyMacro.cmake

+ 2 - 1
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)