diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-02 12:58:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-02 12:58:11 (GMT) |
| commit | b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d (patch) | |
| tree | ffedf3c0181682d4770d8c3461f7e43f47aebc27 | |
| parent | 457bcbd4f9e4972ed55aebf642770b79fa5e8a58 (diff) | |
| parent | bc3697fa51e087953ec0e40a0a865e87c896e3a8 (diff) | |
| download | CMake-b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d.zip CMake-b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d.tar.gz CMake-b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d.tar.bz2 | |
Merge topic 'UseSWIG-fix-regression'
bc3697fa UseSWIG: Restore support for like-named .i files in different modules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1734
| -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 b38e2b7..959893f 100644 --- a/Modules/UseSWIG.cmake +++ b/Modules/UseSWIG.cmake @@ -219,7 +219,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile) if(CMAKE_GENERATOR MATCHES "Make") get_filename_component(swig_generated_timestamp "${swig_generated_file_fullname}" NAME_WE) - set(swig_gen_target gen_${swig_generated_timestamp}) + set(swig_gen_target gen_${name}_${swig_generated_timestamp}) set(swig_generated_timestamp "${swig_outdir}/${swig_generated_timestamp}.stamp") set(swig_custom_output ${swig_generated_timestamp}) @@ -311,9 +311,11 @@ macro(SWIG_ADD_LIBRARY name) endforeach() set(swig_generated_sources) + set(swig_generated_targets) foreach(it ${swig_dot_i_sources}) SWIG_ADD_SOURCE_TO_MODULE(${name} swig_generated_source ${it}) set(swig_generated_sources ${swig_generated_sources} "${swig_generated_source}") + list(APPEND swig_generated_targets "${swig_gen_target}") endforeach() get_directory_property(swig_extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) set_directory_properties(PROPERTIES @@ -324,7 +326,7 @@ macro(SWIG_ADD_LIBRARY name) ${swig_other_sources}) if(CMAKE_GENERATOR MATCHES "Make") # see IMPLICIT_DEPENDS above - add_dependencies(${SWIG_MODULE_${name}_REAL_NAME} ${swig_gen_target}) + add_dependencies(${SWIG_MODULE_${name}_REAL_NAME} ${swig_generated_targets}) endif() if("${_SAM_TYPE}" STREQUAL "MODULE") set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES NO_SONAME ON) |