[Cmake-commits] CMake branch, next, updated. v2.8.4-1766-gddb8988

[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  ddb898840be791ac485df262b87cc550c38a48b6 (commit)
       via  b09ae90badc17d5102b273d2bcfe11ebeeba70fd (commit)
      from  acb5a932f00eb65b0de0edbb1aea63cca83bfdbd (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=ddb898840be791ac485df262b87cc550c38a48b6
commit ddb898840be791ac485df262b87cc550c38a48b6
Merge: acb5a93 b09ae90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 15 16:25:17 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 15 16:25:17 2011 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b09ae90badc17d5102b273d2bcfe11ebeeba70fd
commit b09ae90badc17d5102b273d2bcfe11ebeeba70fd
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: Wed Jun 15 16:23:22 2011 -0400

    FindSWIG: Use NAMES in find_program directives (#12280)
    
    Without this, regular swig (not 2.0) executable is not found
    automatically.

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:
 Modules/FindSWIG.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake