summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Malik <julien.malik@gmail.com>2011-04-28 22:16:32 (GMT)
committerBrad King <brad.king@kitware.com>2011-06-16 20:10:16 (GMT)
commit03809b14429edb14ffbb4e83d2cda32e86555de1 (patch)
treeed14bf37d4c45b57aaf7dc433b34bfcc99c4af5d
parent55b7c87ef2f167e70572305e7b7e65747197e05b (diff)
downloadCMake-03809b14429edb14ffbb4e83d2cda32e86555de1.zip
CMake-03809b14429edb14ffbb4e83d2cda32e86555de1.tar.gz
CMake-03809b14429edb14ffbb4e83d2cda32e86555de1.tar.bz2
FindSWIG: Use NAMES in find_program directives (#12280)
Without this, regular swig (not 2.0) executable is not found automatically. Commit 55b7c87e (Add support for new swig 2.0 application, 2011-03-28) added support for finding swig 2.0 at the (accidental) expense of not finding 1.x. Fix this regression.
-rw-r--r--Modules/FindSWIG.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 8c60bcb..2e34eb1 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -27,7 +27,7 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-FIND_PROGRAM(SWIG_EXECUTABLE swig2.0 swig)
+FIND_PROGRAM(SWIG_EXECUTABLE NAMES swig2.0 swig)
IF(SWIG_EXECUTABLE)
EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -swiglib