[Cmake-commits] CMake branch, next, updated. v2.8.4-1389-g07702c8

[Mathieu Malaterre]

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  07702c8078f9fed3479536b22ba8a95692ca9dae (commit)
       via  55b7c87ef2f167e70572305e7b7e65747197e05b (commit)
      from  bda35d66bb29be4e4911d9567b76d444701f234f (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=07702c8078f9fed3479536b22ba8a95692ca9dae
commit 07702c8078f9fed3479536b22ba8a95692ca9dae
Merge: bda35d6 55b7c87
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Fri Apr 8 09:17:04 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:17:04 2011 -0400

    Merge topic 'fixbug0011843' into next
    
    55b7c87 Add support for new swig 2.0 application


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55b7c87ef2f167e70572305e7b7e65747197e05b
commit 55b7c87ef2f167e70572305e7b7e65747197e05b
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Mon Mar 28 16:05:57 2011 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Fri Apr 8 15:15:58 2011 +0200

    Add support for new swig 2.0 application
    
    This commit fixes BUG: 0011843. It now properly discover if swig2.0
    is in the PATH

diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 2e719ff..8c60bcb 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -15,6 +15,7 @@
 
 #=============================================================================
 # Copyright 2004-2009 Kitware, Inc.
+# Copyright 2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -26,7 +27,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-FIND_PROGRAM(SWIG_EXECUTABLE swig)
+FIND_PROGRAM(SWIG_EXECUTABLE swig2.0 swig)
 
 IF(SWIG_EXECUTABLE)
   EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -swiglib

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

Summary of changes:
 Modules/FindSWIG.cmake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake