[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-837-gc85949b

[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  c85949bfc938a4710b89ee7fdbf8fc0d70b29aea (commit)
       via  224f50f42f8776e4742851daca32846d1041fbb9 (commit)
      from  e25470eec69a77c5e10a18183700be53958448f5 (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=c85949bfc938a4710b89ee7fdbf8fc0d70b29aea
commit c85949bfc938a4710b89ee7fdbf8fc0d70b29aea
Merge: e25470e 224f50f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 11 09:52:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 11 09:52:08 2014 -0400

    Merge topic 'fix-find_dependency-EXACT' into next
    
    224f50f4 find_dependency: Make sure invalid EXACT use can be reported.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=224f50f42f8776e4742851daca32846d1041fbb9
commit 224f50f42f8776e4742851daca32846d1041fbb9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 11 14:49:30 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 11 14:51:06 2014 +0100

    find_dependency: Make sure invalid EXACT use can be reported.
    
    Test the first argument directly for matching 'EXACT'. The error
    check in its previous position was incorrect and would only trigger
    with a version of '0' or similar.

diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 8c61516..99ffca8 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -31,6 +31,9 @@ macro(find_dependency dep)
   if (NOT ${dep}_FOUND)
     set(cmake_fd_version)
     if (${ARGC} GREATER 1)
+      if (${ARGV1} STREQUAL EXACT)
+        message(FATAL_ERROR "Invalid arguments to find_dependency. EXACT may only be specified if a VERSION is specified")
+      endif()
       set(cmake_fd_version ${ARGV1})
     endif()
     set(cmake_fd_exact_arg)
@@ -38,9 +41,6 @@ macro(find_dependency dep)
       if (NOT ${ARGV2} STREQUAL EXACT)
         message(FATAL_ERROR "Invalid arguments to find_dependency")
       endif()
-      if (NOT ${cmake_fd_version})
-        message(FATAL_ERROR "Invalid arguments to find_dependency. EXACT may only be specified if a VERSION is specified")
-      endif()
       set(cmake_fd_exact_arg EXACT)
     endif()
     if(${ARGC} GREATER 3)

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

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


hooks/post-receive
-- 
CMake