[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5937-g8977fe1

[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  8977fe1ab8170d4eb51b48afe30cdfb639ebc6f0 (commit)
       via  f39671c117cfaec29dc81fd44adec2655a17077d (commit)
       via  f0b3502a6586478ef624419e4007e5f5652da2f0 (commit)
      from  24ca5e059a4f6acc68610881f78e1de951700401 (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=8977fe1ab8170d4eb51b48afe30cdfb639ebc6f0
commit 8977fe1ab8170d4eb51b48afe30cdfb639ebc6f0
Merge: 24ca5e0 f39671c
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Fri Nov 29 04:14:55 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 29 04:14:55 2013 -0500

    Merge topic 'UseSWIG-octave' into next
    
    f39671c UseSWIG: Handle octave extensions.
    f0b3502 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f39671c117cfaec29dc81fd44adec2655a17077d
commit f39671c117cfaec29dc81fd44adec2655a17077d
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Fri Nov 29 10:13:27 2013 +0100
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Fri Nov 29 10:13:27 2013 +0100

    UseSWIG: Handle octave extensions.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 28d5ff0..5781e50 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -200,7 +200,10 @@ macro(SWIG_ADD_MODULE name language)
     ${swig_generated_sources}
     ${swig_other_sources})
   string(TOLOWER "${language}" swig_lowercase_language)
-  if ("${swig_lowercase_language}" STREQUAL "java")
+  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 "java")
     if (APPLE)
         # In java you want:
         #      System.loadLibrary("LIBRARY");

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

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


hooks/post-receive
-- 
CMake