[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2588-g74bae17
Brad King
brad.king at kitware.com
Tue Apr 29 09:55:56 EDT 2014
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 74bae17072586e477f5c2717ef707f5ad2a2cefe (commit)
via a3b1be5e6989fb6e6c698d1193b4572b09de7107 (commit)
from 881bf7ffe1c85109bde5b28916ed6a802c47a850 (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=74bae17072586e477f5c2717ef707f5ad2a2cefe
commit 74bae17072586e477f5c2717ef707f5ad2a2cefe
Merge: 881bf7f a3b1be5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 29 09:55:55 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 29 09:55:55 2014 -0400
Merge topic 'UseSWIG-go-support' into next
a3b1be5e UseSWIG: Add support for Go and Lua
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3b1be5e6989fb6e6c698d1193b4572b09de7107
commit a3b1be5e6989fb6e6c698d1193b4572b09de7107
Author: Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Apr 22 08:29:26 2014 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 29 09:56:18 2014 -0400
UseSWIG: Add support for Go and Lua
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index f4fe1df..918e2ec 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -244,6 +244,8 @@ macro(SWIG_ADD_MODULE name language)
if ("${swig_lowercase_language}" STREQUAL "octave")
set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".oct")
+ elseif ("${swig_lowercase_language}" STREQUAL "go")
+ set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
elseif ("${swig_lowercase_language}" STREQUAL "java")
if (APPLE)
# In java you want:
@@ -254,6 +256,8 @@ macro(SWIG_ADD_MODULE name language)
# Linux : libLIBRARY.so
set_target_properties (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".jnilib")
endif ()
+ elseif ("${swig_lowercase_language}" STREQUAL "lua")
+ set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
elseif ("${swig_lowercase_language}" STREQUAL "python")
# this is only needed for the python case where a _modulename.so is generated
set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list