diff options
| author | Brad King <brad.king@kitware.com> | 2011-04-12 18:43:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-04-12 18:43:48 (GMT) |
| commit | f464eb203e6a70e3d7b8139fee38f87c9ec888d3 (patch) | |
| tree | 939423ed583cf6d3547ed490eae693cddedcbe85 /Modules | |
| parent | 445611e53e033c40b0646922aa10f9bd21b90392 (diff) | |
| parent | 55b7c87ef2f167e70572305e7b7e65747197e05b (diff) | |
| download | CMake-f464eb203e6a70e3d7b8139fee38f87c9ec888d3.zip CMake-f464eb203e6a70e3d7b8139fee38f87c9ec888d3.tar.gz CMake-f464eb203e6a70e3d7b8139fee38f87c9ec888d3.tar.bz2 | |
Merge topic 'fixbug0011843'
55b7c87 Add support for new swig 2.0 application
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindSWIG.cmake | 3 |
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 |