[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1659-g6c5e512

[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  6c5e51253b0ba5e7c64f535b35b1b46535cc2794 (commit)
       via  bfe401081bb8c8030168074274c4f4c121fa92ea (commit)
       via  01981d8e45a60a66f3140a981c0bc1e7fe2ea804 (commit)
      from  466bdaac5d10fb3ba2a731608d07a326378b67d1 (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=6c5e51253b0ba5e7c64f535b35b1b46535cc2794
commit 6c5e51253b0ba5e7c64f535b35b1b46535cc2794
Merge: 466bdaa bfe4010
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sun Feb 23 13:59:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 23 13:59:47 2014 -0500

    Merge topic 'fix-10080' into next
    
    bfe40108 Name extra generated files after module name. Fixes #0010080
    01981d8e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bfe401081bb8c8030168074274c4f4c121fa92ea
commit bfe401081bb8c8030168074274c4f4c121fa92ea
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sun Feb 23 19:58:43 2014 +0100
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Sun Feb 23 19:58:43 2014 +0100

    Name extra generated files after module name. Fixes #0010080

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:
 Modules/UseSWIG.cmake     |    7 ++++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake