[Cmake-commits] CMake branch, next, updated. v3.0.0-4129-gd23f713

[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  d23f7134cd2e83d96eec48dd2bc704cedf8a34fc (commit)
       via  7400695ee3dbe0375876c7ffc2b68f356142ae79 (commit)
      from  8c3d453b704708014ddf6b6e9fc4f2edabd64b47 (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=d23f7134cd2e83d96eec48dd2bc704cedf8a34fc
commit d23f7134cd2e83d96eec48dd2bc704cedf8a34fc
Merge: 8c3d453 7400695
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 7 09:20:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 7 09:20:32 2014 -0400

    Merge topic 'FindSWIG-swig3.0' into next
    
    7400695e FindSWIG: Add support for swig 3.0 application


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7400695ee3dbe0375876c7ffc2b68f356142ae79
commit 7400695ee3dbe0375876c7ffc2b68f356142ae79
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Sat Jul 5 14:55:36 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 7 09:18:50 2014 -0400

    FindSWIG: Add support for swig 3.0 application

diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 8bd4048..818d1f2 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -25,6 +25,7 @@
 #=============================================================================
 # Copyright 2004-2009 Kitware, Inc.
 # Copyright 2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
+# Copyright 2014 Sylvain Joubert <joubert.sy at gmail.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -36,7 +37,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)
+find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig)
 
 if(SWIG_EXECUTABLE)
   execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib

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

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


hooks/post-receive
-- 
CMake