[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2546-g08cc470

Julien Schueller schueller at phimeca.com
Thu Apr 24 10:53:18 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  08cc4703c84864e8954aa0c3ea732b557528844c (commit)
       via  f9e037990b11ad5b47aed0572a7233db63965108 (commit)
      from  82779c2dd2e69408b2d0d6a31c8a5afff9fd501a (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=08cc4703c84864e8954aa0c3ea732b557528844c
commit 08cc4703c84864e8954aa0c3ea732b557528844c
Merge: 82779c2 f9e0379
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Thu Apr 24 10:53:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 24 10:53:17 2014 -0400

    Merge topic 'UseSWIG-go-support' into next
    
    f9e03799 Enhanced go/lua support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9e037990b11ad5b47aed0572a7233db63965108
commit f9e037990b11ad5b47aed0572a7233db63965108
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Apr 22 08:29:26 2014 +0200
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Tue Apr 22 08:29:26 2014 +0200

    Enhanced go/lua support

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:
 Modules/UseSWIG.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list