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 9d646670c3d93366360e42d19d724a65f949f7b0 (commit)
via b1d007ce7c9aecac83fe59859c1aba4d6b82ae25 (commit)
from 2710aae7522473b21180799f2de310b0575abc3e (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=9d646670c3d93366360e42d19d724a65f949f7b0
commit 9d646670c3d93366360e42d19d724a65f949f7b0
Merge: 2710aae b1d007c
Author: Julien Schueller <[email protected]>
AuthorDate: Sun Nov 24 15:15:54 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Sun Nov 24 15:15:54 2013 -0500
Merge topic 'UseSWIG-fix13814' into next
b1d007c Handle a dll name different than module name.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1d007ce7c9aecac83fe59859c1aba4d6b82ae25
commit b1d007ce7c9aecac83fe59859c1aba4d6b82ae25
Author: Julien Schueller <[email protected]>
AuthorDate: Sun Nov 24 17:54:59 2013 +0100
Commit: Julien Schueller <[email protected]>
CommitDate: Sun Nov 24 17:54:59 2013 +0100
Handle a dll name different than module name.
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:
Modules/UseSWIG.cmake | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
