summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorJulien Schueller <schueller@phimeca.com>2014-02-23 18:58:43 (GMT)
committerBrad King <brad.king@kitware.com>2014-02-24 15:31:32 (GMT)
commitf0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc (patch)
tree477cb6a838ad91dd5d038dead193cf7cbf977d56 /Modules
parent01981d8e45a60a66f3140a981c0bc1e7fe2ea804 (diff)
downloadCMake-f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.zip
CMake-f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.tar.gz
CMake-f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.tar.bz2
UseSWIG: Name extra generated files after module name (#10080)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseSWIG.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 11ca205..4ae6f81 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -85,9 +85,6 @@ 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}")
@@ -103,6 +100,10 @@ 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()