[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1780-g072d606

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  072d6061135cdacec16690d0a19cb42988354c04 (commit)
       via  3d8f7102bb8335f090f12ced25572df799448ca6 (commit)
       via  85d0f8de7e44ddb4b9a788347079e76d16a19f21 (commit)
      from  184447b6e04996a63abe9d71eb75908c14fdb137 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=072d6061135cdacec16690d0a19cb42988354c04
commit 072d6061135cdacec16690d0a19cb42988354c04
Merge: 184447b 3d8f710
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 10:27:17 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 26 10:27:17 2014 -0500

    Merge topic 'fix-find_dependency-macro' into next
    
    3d8f7102 find_dependency: unset cmake_fd_version variable at end of macro
    85d0f8de find_dependency: use correct version variable name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d8f7102bb8335f090f12ced25572df799448ca6
commit 3d8f7102bb8335f090f12ced25572df799448ca6
Author:     Alex Merry <alex.merry at kde.org>
AuthorDate: Wed Feb 26 11:41:48 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 26 10:27:01 2014 -0500

    find_dependency: unset cmake_fd_version variable at end of macro
    
    This matches the other macro variables.

diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index cf0206b..9334ba3 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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85d0f8de7e44ddb4b9a788347079e76d16a19f21
commit 85d0f8de7e44ddb4b9a788347079e76d16a19f21
Author:     Alex Merry <alex.merry at kde.org>
AuthorDate: Wed Feb 26 11:41:35 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 26 10:27:01 2014 -0500

    find_dependency: use correct version variable name
    
    The code set cmake_fd_version, but used ${version}.

diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 08c4990..cf0206b 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}

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeFindDependencyMacro.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake