[Cmake-commits] CMake branch, next, updated. v3.7.0-1410-gd1565ff

[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  d1565ff672b87389f023fdd1932f407428709e54 (commit)
       via  62c4cb4b6f0cdb2be2729362133f850d6fe96c20 (commit)
      from  04b111b971f3e8d6f8c891d8f52943a2dca73496 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1565ff672b87389f023fdd1932f407428709e54
commit d1565ff672b87389f023fdd1932f407428709e54
Merge: 04b111b 62c4cb4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 29 10:22:35 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 29 10:22:35 2016 -0500

    Merge topic 'UseSWIG-java-outputs' into next
    
    62c4cb4b UseSWIG: Record generated java files as custom command outputs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62c4cb4b6f0cdb2be2729362133f850d6fe96c20
commit 62c4cb4b6f0cdb2be2729362133f850d6fe96c20
Author:     caryoscelus <caryoscelus at gmx.com>
AuthorDate: Mon Nov 28 21:46:41 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 29 10:21:05 2016 -0500

    UseSWIG: Record generated java files as custom command outputs
    
    When another target depends on the generated files CMake must know which
    custom command generates them in order to hook up the dependency
    properly.  We already do this for Python.  Add the Java files too.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index c5912f8..651f9f1 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -57,7 +57,8 @@
 set(SWIG_CXX_EXTENSION "cxx")
 set(SWIG_EXTRA_LIBRARIES "")
 
-set(SWIG_PYTHON_EXTRA_FILE_EXTENSION "py")
+set(SWIG_PYTHON_EXTRA_FILE_EXTENSIONS ".py")
+set(SWIG_JAVA_EXTRA_FILE_EXTENSIONS ".java" "JNI.java")
 
 #
 # For given swig module initialize variables associated with it
@@ -123,9 +124,9 @@ macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
     endif ()
 
   endif()
-  foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSION})
+  foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSIONS})
     set(${outfiles} ${${outfiles}}
-      "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}.${it}")
+      "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}${it}")
   endforeach()
 endmacro()
 

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

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


hooks/post-receive
-- 
CMake