UseSWIG: Name extra generated files after module name (#10080)
This commit is contained in:
parent
01981d8e45
commit
f0111deb1e
|
@ -85,9 +85,6 @@ macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
|
||||||
set(${outfiles} "")
|
set(${outfiles} "")
|
||||||
get_source_file_property(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
|
get_source_file_property(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
|
||||||
${infile} SWIG_MODULE_NAME)
|
${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})
|
foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSION})
|
||||||
set(${outfiles} ${${outfiles}}
|
set(${outfiles} ${${outfiles}}
|
||||||
"${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}.${it}")
|
"${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_generated ${infile} GENERATED)
|
||||||
get_source_file_property(swig_source_file_cplusplus ${infile} CPLUSPLUS)
|
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_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")
|
if("${swig_source_file_flags}" STREQUAL "NOTFOUND")
|
||||||
set(swig_source_file_flags "")
|
set(swig_source_file_flags "")
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue