[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5902-g1344b9c

[Julien Schueller]

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  1344b9ccf22ef29d78050b2a1ddb8e870a327588 (commit)
       via  74f5545d0aa0a4ba6856b1280782b2c23185a6e1 (commit)
       via  93d2322e890fdcba37519a174e2c25144e9150c4 (commit)
      from  a3924493c1cb32063b254efaf62ac592e92df743 (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=1344b9ccf22ef29d78050b2a1ddb8e870a327588
commit 1344b9ccf22ef29d78050b2a1ddb8e870a327588
Merge: a392449 74f5545
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Thu Nov 28 04:26:53 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 28 04:26:53 2013 -0500

    Merge topic 'UseSWIG-fix12184' into next
    
    74f5545 UseSWIG: set .bundle ext on OSX and no prefix (#12184)
    93d2322 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74f5545d0aa0a4ba6856b1280782b2c23185a6e1
commit 74f5545d0aa0a4ba6856b1280782b2c23185a6e1
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Thu Nov 28 10:26:14 2013 +0100
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Thu Nov 28 10:26:14 2013 +0100

    UseSWIG: set .bundle ext on OSX and no prefix (#12184)

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 28d5ff0..3123aea 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -210,8 +210,7 @@ macro(SWIG_ADD_MODULE name language)
         #   Linux  : libLIBRARY.so
         set_target_properties (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".jnilib")
       endif ()
-  endif ()
-  if ("${swig_lowercase_language}" STREQUAL "python")
+  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 "")
     # Python extension modules on Windows must have the extension ".pyd"
@@ -225,6 +224,17 @@ macro(SWIG_ADD_MODULE name language)
     if(WIN32 AND NOT CYGWIN)
       set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".pyd")
     endif()
+  elseif ("${swig_lowercase_language}" STREQUAL "ruby")
+    # In ruby you want:
+    #      require 'LIBRARY'
+    # then ruby will look for a library whose name is platform dependent, namely
+    #   MacOS  : LIBRARY.bundle
+    #   Windows: LIBRARY.dll
+    #   Linux  : LIBRARY.so
+    set_target_properties (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
+    if (APPLE)
+      set_target_properties (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".bundle")
+    endif ()
   endif ()
 endmacro()
 

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

Summary of changes:
 Modules/UseSWIG.cmake     |   14 ++++++++++++--
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake