summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorJulien Schueller <schueller@phimeca.com>2014-03-20 09:03:56 (GMT)
committerBrad King <brad.king@kitware.com>2014-03-20 12:57:34 (GMT)
commitd97606477118ba186f49753b5630e4ddb24a6cd2 (patch)
treefb347d1dd1a7d6fc127840623a3cdb456812c54b /Modules
parentf0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc (diff)
downloadCMake-d97606477118ba186f49753b5630e4ddb24a6cd2.zip
CMake-d97606477118ba186f49753b5630e4ddb24a6cd2.tar.gz
CMake-d97606477118ba186f49753b5630e4ddb24a6cd2.tar.bz2
Revert "UseSWIG: Name extra generated files after module name (#10080)"
This reverts commit f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseSWIG.cmake7
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 4ae6f81..11ca205 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -85,6 +85,9 @@ 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}")
@@ -100,10 +103,6 @@ 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()