[Cmake-commits] CMake branch, next, updated. v2.8.4-1772-g3b379b5

[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  3b379b56dfd07e96b812248c7df239c57aebe195 (commit)
       via  03809b14429edb14ffbb4e83d2cda32e86555de1 (commit)
      from  8b4d14c735de706995138e830fa015a49193fac3 (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=3b379b56dfd07e96b812248c7df239c57aebe195
commit 3b379b56dfd07e96b812248c7df239c57aebe195
Merge: 8b4d14c 03809b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 16 16:13:42 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 16 16:13:42 2011 -0400

    Merge topic 'FindSWIG-find_program-NAMES-issue-12280' into next
    
    03809b1 FindSWIG: Use NAMES in find_program directives (#12280)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03809b14429edb14ffbb4e83d2cda32e86555de1
commit 03809b14429edb14ffbb4e83d2cda32e86555de1
Author:     Julien Malik <julien.malik at gmail.com>
AuthorDate: Fri Apr 29 00:16:32 2011 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 16 16:10:16 2011 -0400

    FindSWIG: Use NAMES in find_program directives (#12280)
    
    Without this, regular swig (not 2.0) executable is not found
    automatically.
    
    Commit 55b7c87e (Add support for new swig 2.0 application, 2011-03-28)
    added support for finding swig 2.0 at the (accidental) expense of not
    finding 1.x.  Fix this regression.

diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 8c60bcb..2e34eb1 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -27,7 +27,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-FIND_PROGRAM(SWIG_EXECUTABLE swig2.0 swig)
+FIND_PROGRAM(SWIG_EXECUTABLE NAMES swig2.0 swig)
 
 IF(SWIG_EXECUTABLE)
   EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -swiglib

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

Summary of changes:


hooks/post-receive
-- 
CMake