[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1694-gb9e63d8

[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  b9e63d855e2203edb06b11e0f407b270b0be0c31 (commit)
       via  2be6dbe4207cda39b479e7c81d172d49dd67cc38 (commit)
       via  a35ce7235b94ce040b605d87ee326e8d354a5ecb (commit)
      from  f5a69f67471432455aeb609cd3b8e94687dea02c (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=b9e63d855e2203edb06b11e0f407b270b0be0c31
commit b9e63d855e2203edb06b11e0f407b270b0be0c31
Merge: f5a69f6 2be6dbe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 24 13:01:19 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 24 13:01:19 2014 -0500

    Merge topic 'fix-find_dependency-macro' into next
    
    2be6dbe4 find_dependency: Ensure that ARGV1 has valid local content
    a35ce723 find_dependency: Add namespacing for variables in the macro.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2be6dbe4207cda39b479e7c81d172d49dd67cc38
commit 2be6dbe4207cda39b479e7c81d172d49dd67cc38
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 24 18:59:11 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 24 19:00:42 2014 +0100

    find_dependency: Ensure that ARGV1 has valid local content
    
    The ARGV1 value could come from a wrapping context if find_dependency
    is called from a function.

diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 142130d..08c4990 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -29,7 +29,10 @@
 
 macro(find_dependency dep)
   if (NOT ${dep}_FOUND)
-    set(cmake_fd_version ${ARGV1})
+    set(cmake_fd_version)
+    if (${ARGC} GREATER 1)
+      set(cmake_fd_version ${ARGV1})
+    endif()
     set(cmake_fd_exact_arg)
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
       set(cmake_fd_exact_arg EXACT)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a35ce7235b94ce040b605d87ee326e8d354a5ecb
commit a35ce7235b94ce040b605d87ee326e8d354a5ecb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 24 18:27:35 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 24 19:00:31 2014 +0100

    find_dependency: Add namespacing for variables in the macro.
    
    Avoid setting a variable called 'version' etc.

diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index c0a0ef7..142130d 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -29,27 +29,31 @@
 
 macro(find_dependency dep)
   if (NOT ${dep}_FOUND)
-    set(version ${ARGV1})
-    set(exact_arg)
+    set(cmake_fd_version ${ARGV1})
+    set(cmake_fd_exact_arg)
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
-      set(exact_arg EXACT)
+      set(cmake_fd_exact_arg EXACT)
     endif()
-    set(quiet_arg)
+    set(cmake_fd_quiet_arg)
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
-      set(quiet_arg QUIET)
+      set(cmake_fd_quiet_arg QUIET)
     endif()
-    set(required_arg)
+    set(cmake_fd_required_arg)
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
-      set(required_arg REQUIRED)
+      set(cmake_fd_required_arg REQUIRED)
     endif()
 
-    get_property(alreadyTransitive GLOBAL PROPERTY
+    get_property(cmake_fd_alreadyTransitive GLOBAL PROPERTY
       _CMAKE_${dep}_TRANSITIVE_DEPENDENCY
     )
 
-    find_package(${dep} ${version} ${exact_arg} ${quiet_arg} ${required_arg})
+    find_package(${dep} ${version}
+        ${cmake_fd_exact_arg}
+        ${cmake_fd_quiet_arg}
+        ${cmake_fd_required_arg}
+    )
 
-    if(NOT DEFINED alreadyTransitive OR alreadyTransitive)
+    if(NOT DEFINED cmake_fd_alreadyTransitive OR cmake_fd_alreadyTransitive)
       set_property(GLOBAL PROPERTY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY TRUE)
     endif()
 
@@ -58,8 +62,8 @@ macro(find_dependency dep)
       set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False)
       return()
     endif()
-    set(required_arg)
-    set(quiet_arg)
-    set(exact_arg)
+    set(cmake_fd_required_arg)
+    set(cmake_fd_quiet_arg)
+    set(cmake_fd_exact_arg)
   endif()
 endmacro()

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

Summary of changes:
 Modules/CMakeFindDependencyMacro.cmake |   33 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake