[Cmake-commits] CMake branch, next, updated. v3.2.1-1287-g1be2f68

[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  1be2f68af5206a0dc742449a71e6e5611de50df0 (commit)
       via  b372a99a130ec89561b2ad8d3147298dff3cf4df (commit)
      from  f6c6c3af25e552820104f16381f0b1c385b6a7b6 (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=1be2f68af5206a0dc742449a71e6e5611de50df0
commit 1be2f68af5206a0dc742449a71e6e5611de50df0
Merge: f6c6c3a b372a99
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 30 09:39:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 30 09:39:15 2015 -0400

    Merge topic 'UseSWIG-no-MAIN_DEPENDENCY' into next
    
    b372a99a UseSWIG: Do not use MAIN_DEPENDENCY on custom commands (#15480)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b372a99a130ec89561b2ad8d3147298dff3cf4df
commit b372a99a130ec89561b2ad8d3147298dff3cf4df
Author:     Felix Schwitzer <felix.schwitzer at gmx.at>
AuthorDate: Thu Mar 26 21:03:20 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 30 09:35:43 2015 -0400

    UseSWIG: Do not use MAIN_DEPENDENCY on custom commands (#15480)
    
    Add the dependency on the main swig input source file as a normal
    DEPENDS option.  We cannot use MAIN_DEPENDENCY because if there are
    multiple target languages then multiple custom commands would want to
    use the same MAIN_DEPENDENCY, but at most one custom command may specify
    a given source file as its MAIN_DEPENDENCY.  Exposed by a CMP0057
    warning.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 7939b1f..7423418 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -204,8 +204,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
     ${swig_include_dirs}
     -o "${swig_generated_file_fullname}"
     "${swig_source_file_fullname}"
-    MAIN_DEPENDENCY "${swig_source_file_fullname}"
-    DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
+    DEPENDS "${swig_source_file_fullname}" ${SWIG_MODULE_${name}_EXTRA_DEPS}
     COMMENT "Swig source")
   set_source_files_properties("${swig_generated_file_fullname}" ${swig_extra_generated_files}
     PROPERTIES GENERATED 1)

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

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


hooks/post-receive
-- 
CMake