summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2011-03-28 14:05:57 (GMT)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2011-04-08 13:15:58 (GMT)
commit55b7c87ef2f167e70572305e7b7e65747197e05b (patch)
treeb98c0bcd0f14417e09b9078c2e309fd197fff11e
parent0e66141bea25a93a5ef42c39d5c3a0b6612c1fe6 (diff)
downloadCMake-55b7c87ef2f167e70572305e7b7e65747197e05b.zip
CMake-55b7c87ef2f167e70572305e7b7e65747197e05b.tar.gz
CMake-55b7c87ef2f167e70572305e7b7e65747197e05b.tar.bz2
Add support for new swig 2.0 application
This commit fixes BUG: 0011843. It now properly discover if swig2.0 is in the PATH
-rw-r--r--Modules/FindSWIG.cmake3
1 files changed, 2 insertions, 1 deletions
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@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