[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1663-g1d3547d

[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  1d3547dbb4d5a997de105d833aeb9451787b5765 (commit)
       via  f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc (commit)
      from  d718436d10807553fa4187f75e9dd1eddd443d85 (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=1d3547dbb4d5a997de105d833aeb9451787b5765
commit 1d3547dbb4d5a997de105d833aeb9451787b5765
Merge: d718436 f0111de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 24 10:32:29 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 24 10:32:29 2014 -0500

    Merge topic 'UseSWIG-avoid-extra-rebuilds' into next
    
    f0111deb UseSWIG: Name extra generated files after module name (#10080)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc
commit f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sun Feb 23 19:58:43 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 24 10:31:32 2014 -0500

    UseSWIG: Name extra generated files after module name (#10080)

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 11ca205..4ae6f81 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -85,9 +85,6 @@ macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
   set(${outfiles} "")
   get_source_file_property(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
     ${infile} SWIG_MODULE_NAME)
-  if(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
-    get_filename_component(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename "${infile}" NAME_WE)
-  endif()
   foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSION})
     set(${outfiles} ${${outfiles}}
       "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}.${it}")
@@ -103,6 +100,10 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   get_source_file_property(swig_source_file_generated ${infile} GENERATED)
   get_source_file_property(swig_source_file_cplusplus ${infile} CPLUSPLUS)
   get_source_file_property(swig_source_file_flags ${infile} SWIG_FLAGS)
+  get_source_file_property(_SWIG_MODULE_NAME ${infile} SWIG_MODULE_NAME)
+  if ( NOT _SWIG_MODULE_NAME )
+    set_source_files_properties(${infile} PROPERTIES SWIG_MODULE_NAME ${name})
+  endif ()
   if("${swig_source_file_flags}" STREQUAL "NOTFOUND")
     set(swig_source_file_flags "")
   endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake