[Cmake-commits] CMake branch, next, updated. v3.0.2-2057-g8d2487b

[Brad King]

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  8d2487be5758143e5a6b6f9da3bad09db46c46ac (commit)
       via  9de113a943ae273b76c1b3cb648ac051aaa87f10 (commit)
      from  b4927726404d5565c573ae355b163f3cdc0421c5 (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=8d2487be5758143e5a6b6f9da3bad09db46c46ac
commit 8d2487be5758143e5a6b6f9da3bad09db46c46ac
Merge: b492772 9de113a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 14 09:42:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 14 09:42:17 2014 -0400

    Merge topic 'UseSWIG-r-support' into next
    
    9de113a9 UseSWIG: Fix R module prefix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9de113a943ae273b76c1b3cb648ac051aaa87f10
commit 9de113a943ae273b76c1b3cb648ac051aaa87f10
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Oct 14 14:09:53 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 14 09:41:58 2014 -0400

    UseSWIG: Fix 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 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake