[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1652-g86fc5fe

[Stephen Kelly]

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  86fc5fe20405eae1e91abe4f7cc939846c6786a6 (commit)
       via  5878c5d919a206b9a54f48f386ab98b5cff09e08 (commit)
      from  ddf6c3c882b07cb31e09d2d2e9da79dd0c897f79 (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=86fc5fe20405eae1e91abe4f7cc939846c6786a6
commit 86fc5fe20405eae1e91abe4f7cc939846c6786a6
Merge: ddf6c3c 5878c5d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 23 05:32:21 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 23 05:32:21 2014 -0500

    Merge topic 'fix-find_dependency-macro' into next
    
    5878c5d9 Always set version variable of find_dependency macro


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5878c5d919a206b9a54f48f386ab98b5cff09e08
commit 5878c5d919a206b9a54f48f386ab98b5cff09e08
Author:     Alex Merry <kde at randomguy3.me.uk>
AuthorDate: Sat Feb 22 13:35:14 2014 +0000
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 23 11:31:30 2014 +0100

    Always set version variable of find_dependency macro
    
    If there is no ARGV1, that is fine; version will be made empty, and no
    version will be passed to find_package().
    
    This is relevant when find_dependency is invoked multiple times,
    sometimes with a version specified and sometimes without.
    
     find_dependency(dep1 3.4)
     find_dependency(dep2) # version still set to 3.4.

diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 0f1f56d..c0a0ef7 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -29,9 +29,7 @@
 
 macro(find_dependency dep)
   if (NOT ${dep}_FOUND)
-    if (${ARGV1})
-      set(version ${ARGV1})
-    endif()
+    set(version ${ARGV1})
     set(exact_arg)
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
       set(exact_arg EXACT)

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

Summary of changes:
 Modules/CMakeFindDependencyMacro.cmake |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake