[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2466-g3f46c7e

[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  3f46c7e526cd9cf2128eb95e4feea2681bcf4b63 (commit)
       via  ec68ce11cf7d0e16aefa94324fd174bfa9fd6083 (commit)
      from  b366302f11ff6e2ba354110dff8b728d8f486548 (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=3f46c7e526cd9cf2128eb95e4feea2681bcf4b63
commit 3f46c7e526cd9cf2128eb95e4feea2681bcf4b63
Merge: b366302 ec68ce1
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Fri Apr 18 10:57:27 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 18 10:57:27 2014 -0400

    Merge topic 'UseSWIG-guess_module_name' into next
    
    ec68ce11 Reworked UseSWIG documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec68ce11cf7d0e16aefa94324fd174bfa9fd6083
commit ec68ce11cf7d0e16aefa94324fd174bfa9fd6083
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Fri Apr 18 16:56:37 2014 +0200
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Fri Apr 18 16:56:37 2014 +0200

    Reworked UseSWIG documentation

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 1a76fe3..060b44c 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -2,9 +2,7 @@
 # UseSWIG
 # -------
 #
-# SWIG module for CMake
-#
-# Defines the following macros:
+# Defines the following macros for use with SWIG:
 #
 # ::
 #
@@ -13,23 +11,38 @@
 #    SWIG_LINK_LIBRARIES(name [ libraries ])
 #      - Link libraries to swig module
 #
-# All other macros are for internal use only.
-# Set source files properties such as CPLUSPLUS and SWIG_FLAGS to specify
-# special behavior of SWIG.
-# The property SWIG_MODULE_NAME can be used to specify the actual import name of the module
-# in the target language if it cannot be parsed or different from the module file basename.
+# Source files properties on module files can be set before the invocation
+# of the SWIG_ADD_MODULE macro to specify special behavior of SWIG.
+#
+# The source file property CPLUSPLUS calls SWIG in c++ mode, e.g.::
+#
+#    set_property(SOURCE mymod.i PROPERTY CPLUSPLUS ON)
+#    swig_add_module(mymod python mymod.i)
+#
+# The source file property SWIG_FLAGS adds custom flags to the SWIG executable.
+#
+# The source-file property SWIG_MODULE_NAME have to be provided to specify the actual
+# import name of the module in the target language if it cannot be scanned automatically
+# from source or different from the module file basename.::
+#
+#    set_property(SOURCE mymod.i PROPERTY SWIG_MODULE_NAME mymod_realname)
+#
 # To get the name of the swig module target library, use: ${SWIG_MODULE_${name}_REAL_NAME}.
-# Also global CMAKE_SWIG_FLAGS can be used to add
-# special flags to all swig calls.  Another special variable is
-# CMAKE_SWIG_OUTDIR, it allows one to specify where to write all the
-# swig generated module (swig -outdir option) The name-specific variable
-# SWIG_MODULE_<name>_EXTRA_DEPS may be used to specify extra
-# dependencies for the generated modules.  If the source file generated
-# by swig need some special flag you can use::
 #
-#   set_source_files_properties( ${swig_generated_file_fullname}
-#         PROPERTIES COMPILE_FLAGS "-bla")
-
+# Also some variables can be set to specify special behavior of SWIG.
+#
+# CMAKE_SWIG_FLAGS can be used to add special flags to all swig calls.
+#
+# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify
+# where to write all the swig generated module (swig -outdir option)
+#
+# The name-specific variable SWIG_MODULE_<name>_EXTRA_DEPS may be used to specify extra
+# dependencies for the generated modules.
+#
+# If the source file generated by swig need some special flag you can use::
+#
+#    set_source_files_properties( ${swig_generated_file_fullname}
+#                                 PROPERTIES COMPILE_FLAGS "-bla")
 
 #=============================================================================
 # Copyright 2004-2009 Kitware, Inc.

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

Summary of changes:
 Modules/UseSWIG.cmake |   49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake