[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5735-gaab0a92

[Brad King]

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  aab0a928b46da4b525726ce511be04754735f065 (commit)
       via  acc59e55e12c1979735ba42569411892e215afba (commit)
      from  52bdbf084212f3fe258086e28fff7be55640e4b9 (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=aab0a928b46da4b525726ce511be04754735f065
commit aab0a928b46da4b525726ce511be04754735f065
Merge: 52bdbf0 acc59e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 08:33:00 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 08:33:00 2013 -0500

    Merge topic 'UseSWIG-fix13814' into next
    
    acc59e5 UseSWIG: Handle a dll name different than module name (#13814)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acc59e55e12c1979735ba42569411892e215afba
commit acc59e55e12c1979735ba42569411892e215afba
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sun Nov 24 17:54:59 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 25 08:32:13 2013 -0500

    UseSWIG: Handle a dll name different than module name (#13814)

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 00f3e21..f957399 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -68,6 +68,10 @@ macro(SWIG_MODULE_INITIALIZE name language)
     set(SWIG_MODULE_${name}_REAL_NAME "_${name}")
   elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL")
     set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
+  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "CSHARP")
+    # 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}")
   endif()
 endmacro()
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake