[Cmake-commits] CMake branch, next, updated. v3.0.2-5739-g06af372

[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  06af3723e11ccd7be7832878063d4e6d68929384 (commit)
       via  9f28bf65664bfa88d9c6ff35902b0b339d01f2c2 (commit)
       via  54ff77dc621a91302abad0ab38d9bd26de8914b9 (commit)
      from  6787d2407587c3ab96e78e245938efd925c95076 (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=06af3723e11ccd7be7832878063d4e6d68929384
commit 06af3723e11ccd7be7832878063d4e6d68929384
Merge: 6787d24 9f28bf6
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Oct 14 08:10:48 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 14 08:10:48 2014 -0400

    Merge topic 'UseSWIG-r-support' into next
    
    9f28bf65 Correct r module prefix
    54ff77dc CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f28bf65664bfa88d9c6ff35902b0b339d01f2c2
commit 9f28bf65664bfa88d9c6ff35902b0b339d01f2c2
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Oct 14 14:09:53 2014 +0200
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Tue Oct 14 14:09:53 2014 +0200

    Correct r module prefix

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 31ab48d..bab1b21 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -272,6 +272,8 @@ 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 "r")
+    set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
   elseif ("${swig_lowercase_language}" STREQUAL "ruby")
     # In ruby you want:
     #      require 'LIBRARY'

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

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


hooks/post-receive
-- 
CMake