[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1263-g068ac04

[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  068ac04e59808b8e9b08d3cb7ab65e69c054ad7a (commit)
       via  d97606477118ba186f49753b5630e4ddb24a6cd2 (commit)
      from  cb00da466a3944785547e580a1e531cf86504d97 (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=068ac04e59808b8e9b08d3cb7ab65e69c054ad7a
commit 068ac04e59808b8e9b08d3cb7ab65e69c054ad7a
Merge: cb00da4 d976064
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 08:57:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 08:57:51 2014 -0400

    Merge topic 'UseSWIG-revert-bad-fix-0010080' into next
    
    d9760647 Revert "UseSWIG: Name extra generated files after module name (#10080)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d97606477118ba186f49753b5630e4ddb24a6cd2
commit d97606477118ba186f49753b5630e4ddb24a6cd2
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Thu Mar 20 10:03:56 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 20 08:57:34 2014 -0400

    Revert "UseSWIG: Name extra generated files after module name (#10080)"
    
    This reverts commit f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 4ae6f81..11ca205 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -85,6 +85,9 @@ 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}")
@@ -100,10 +103,6 @@ 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 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake