[Cmake-commits] CMake branch, next, updated. v2.8.7-2827-g1d7ed1f
Rolf Eike Beer
eike at sf-mail.de
Thu Feb 23 12:40:22 EST 2012
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 1d7ed1faaed7db47b20681adf44fdc22ea4f6903 (commit)
via aca1121ea6d7aca8634d07a07fe150344ce13e40 (commit)
via e8e964f675dc2475e871a13bb5dae99ef7a40201 (commit)
from a4e84bdf90d68dd54cc201e5007a6c96def7d11d (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=1d7ed1faaed7db47b20681adf44fdc22ea4f6903
commit 1d7ed1faaed7db47b20681adf44fdc22ea4f6903
Merge: a4e84bd aca1121
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 23 12:40:19 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 12:40:19 2012 -0500
Merge topic 'cleanup-useswig' into next
aca1121 UseSWIG: clean up string compares
e8e964f KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aca1121ea6d7aca8634d07a07fe150344ce13e40
commit aca1121ea6d7aca8634d07a07fe150344ce13e40
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 23 18:39:23 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Feb 23 18:39:23 2012 +0100
UseSWIG: clean up string compares
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 2a83045..ef76724 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -47,20 +47,17 @@ MACRO(SWIG_MODULE_INITIALIZE name language)
SET(SWIG_MODULE_${name}_LANGUAGE "${swig_uppercase_language}")
SET(SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG "${swig_lowercase_language}")
- IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")
- MESSAGE(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
- ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")
-
SET(SWIG_MODULE_${name}_REAL_NAME "${name}")
- IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
+ IF("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN")
+ MESSAGE(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
+ ELSEIF("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PYTHON")
# when swig is used without the -interface it will produce in the module.py
# a 'import _modulename' statement, which implies having a corresponding
# _modulename.so (*NIX), _modulename.pyd (Win32).
SET(SWIG_MODULE_${name}_REAL_NAME "_${name}")
- ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
- IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
+ ELSEIF("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL")
SET(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
- ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
+ ENDIF()
ENDMACRO(SWIG_MODULE_INITIALIZE)
#
-----------------------------------------------------------------------
Summary of changes:
Modules/UseSWIG.cmake | 13 +++++--------
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list