diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-09 16:38:49 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-09 16:38:49 -0400 |
| commit | 0fe4cce22f440f0e666c9691bc6e03d34380ae4f (patch) | |
| tree | 5c059c8a021b839a84b1ccddf0df17594731f56f | |
| parent | 244e3d0fc97433a9e75a82a64f98ea25ab11d3bb (diff) | |
| parent | 458c9e95dee1f6c5a6e5b537a544a8a7c8c56d10 (diff) | |
| download | cmake-0fe4cce22f440f0e666c9691bc6e03d34380ae4f.tar.gz | |
Merge branch 'UseSWIG-fix-CMP0054-warnings' into release
| -rw-r--r-- | Modules/UseSWIG.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake index bab1b21261..7939b1f626 100644 --- a/Modules/UseSWIG.cmake +++ b/Modules/UseSWIG.cmake @@ -76,16 +76,16 @@ macro(SWIG_MODULE_INITIALIZE name language) if (";${CMAKE_SWIG_FLAGS};" MATCHES ";-noproxy;") set (SWIG_MODULE_${name}_NOPROXY TRUE) endif () - if("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN") + if("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xUNKNOWN") message(FATAL_ERROR "SWIG Error: Language \"${language}\" not found") - elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PYTHON" AND NOT SWIG_MODULE_${name}_NOPROXY) + elseif("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xPYTHON" AND NOT SWIG_MODULE_${name}_NOPROXY) # swig will produce a module.py containing an 'import _modulename' statement, # which implies having a corresponding _modulename.so (*NIX), _modulename.pyd (Win32), # unless the -noproxy flag is used set(SWIG_MODULE_${name}_REAL_NAME "_${name}") - elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL") + elseif("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xPERL") set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow") - elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "CSHARP") + elseif("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xCSHARP") # This makes sure that the name used in the generated DllImport # matches the library name created by CMake set(SWIG_MODULE_${name}_EXTRA_FLAGS "-dllimport;${name}") |