diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-02 15:56:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-02 15:56:07 (GMT) |
| commit | 1181ad61d2f5a548d6a823a7fa4bff3a71fa7b3d (patch) | |
| tree | 169393bb7129a64bedd51f53102b48133e1a23d8 | |
| parent | 39bd20a490fb0db69076ef246729fced6d22de01 (diff) | |
| parent | b4fbf677bbbb0a2789955f3d27ff24dd3ffac714 (diff) | |
| download | CMake-1181ad61d2f5a548d6a823a7fa4bff3a71fa7b3d.zip CMake-1181ad61d2f5a548d6a823a7fa4bff3a71fa7b3d.tar.gz CMake-1181ad61d2f5a548d6a823a7fa4bff3a71fa7b3d.tar.bz2 | |
Merge branch 'UseSWIG-Java-enabled' into release-3.9
Merge-request: !1095
| -rw-r--r-- | Modules/UseSWIG.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake index bfe1a6f..fc815dd 100644 --- a/Modules/UseSWIG.cmake +++ b/Modules/UseSWIG.cmake @@ -125,8 +125,10 @@ macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile) endif() foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSIONS}) - set(${outfiles} ${${outfiles}} - "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}${it}") + set(extra_file "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}${it}") + list(APPEND ${outfiles} ${extra_file}) + # Treat extra outputs as plain files regardless of language. + set_property(SOURCE "${extra_file}" PROPERTY LANGUAGE "") endforeach() endmacro() |