diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-30 13:37:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-30 13:37:18 (GMT) |
| commit | d5ab04f065b85a300c348236519b4c024dd19377 (patch) | |
| tree | ba2b492a39f7e8ef393d6a48165ee53b5734f9a8 | |
| parent | 8224545b1db801d6ffeac6424eaf5757416082aa (diff) | |
| parent | 62c4cb4b6f0cdb2be2729362133f850d6fe96c20 (diff) | |
| download | CMake-d5ab04f065b85a300c348236519b4c024dd19377.zip CMake-d5ab04f065b85a300c348236519b4c024dd19377.tar.gz CMake-d5ab04f065b85a300c348236519b4c024dd19377.tar.bz2 | |
Merge topic 'UseSWIG-java-outputs'
62c4cb4b UseSWIG: Record generated java files as custom command outputs
| -rw-r--r-- | Modules/UseSWIG.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
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() |