[Cmake-commits] CMake branch, next, updated. v3.2.2-1836-gfd0abd0

[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  fd0abd02fff468bedbd1c07ebddf10522f385bca (commit)
       via  dd7e31bc15471b5c3ea31fcbe2002650780e78b6 (commit)
      from  c6d9edd1dfd21bbb3fb1d99053d90114be6c3260 (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=fd0abd02fff468bedbd1c07ebddf10522f385bca
commit fd0abd02fff468bedbd1c07ebddf10522f385bca
Merge: c6d9edd dd7e31b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 15 11:40:55 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 15 11:40:55 2015 -0400

    Merge topic 'UseSWIG-use-absolute-path' into next
    
    dd7e31bc UseSWIG: Fix module name detection with relative source file (#15508)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd7e31bc15471b5c3ea31fcbe2002650780e78b6
commit dd7e31bc15471b5c3ea31fcbe2002650780e78b6
Author:     Tuukka Pasanen <pasanen.tuukka at gmail.com>
AuthorDate: Wed Apr 15 11:37:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 15 11:39:44 2015 -0400

    UseSWIG: Fix module name detection with relative source file (#15508)
    
    When SWIG_GET_EXTRA_OUTPUT_FILES checks to see if a source file exists
    for use in reading the module name, it must pass an absolute path to
    the if(EXISTS) command.  Teach SWIG_ADD_SOURCE_TO_MODULE to give it
    the absolute path it already knows.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 7423418..1862876 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -156,7 +156,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
     swig_extra_generated_files
     "${swig_outdir}"
-    "${infile}")
+    "${swig_source_file_fullname}")
   set(swig_generated_file_fullname
     "${swig_outdir}/${swig_source_file_name_we}")
   # add the language into the name of the file (i.e. TCL_wrap)

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

Summary of changes:
 Modules/UseSWIG.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake