diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-09 14:02:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-09 14:02:43 (GMT) |
| commit | 49910f1a2c9819a848b8d3b4c15d970039d7f101 (patch) | |
| tree | fae98a122fe52d1bc9ef24a49eb594f1ef157691 /Modules | |
| parent | 77e4f5490e3a14a265b931f79bcb621d164389d6 (diff) | |
| parent | 7400695ee3dbe0375876c7ffc2b68f356142ae79 (diff) | |
| download | CMake-49910f1a2c9819a848b8d3b4c15d970039d7f101.zip CMake-49910f1a2c9819a848b8d3b4c15d970039d7f101.tar.gz CMake-49910f1a2c9819a848b8d3b4c15d970039d7f101.tar.bz2 | |
Merge topic 'FindSWIG-swig3.0'
7400695e FindSWIG: Add support for swig 3.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 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@gmail.com> +# Copyright 2014 Sylvain Joubert <joubert.sy@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 |