This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d (commit)
via bc3697fa51e087953ec0e40a0a865e87c896e3a8 (commit)
from 457bcbd4f9e4972ed55aebf642770b79fa5e8a58 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d
commit b12069f7b0dc0a5e9b9031dcae2cca1b1ff7281d
Merge: 457bcbd bc3697f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 2 12:58:04 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Feb 2 07:58:11 2018 -0500
Merge topic 'UseSWIG-fix-regression'
bc3697fa UseSWIG: Restore support for like-named .i files in different
modules
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1734
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc3697fa51e087953ec0e40a0a865e87c896e3a8
commit bc3697fa51e087953ec0e40a0a865e87c896e3a8
Author: Marc Chevrier <marc.chevr...@sap.com>
AuthorDate: Thu Feb 1 14:49:05 2018 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 2 07:41:44 2018 -0500
UseSWIG: Restore support for like-named .i files in different modules
Fix logic added by commit 2ee10119ea (swig: fix incremental build in
case of removed interface files, 2017-11-06). Name the extra targets
added for Makefile generators using both the module name and .i base
name to avoid collisions across modules. Also make sure the extra
targets added for all .i files in a module are added as dependencies
instead of just the last one.
Fixes: #17704
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/UseSWIG.cmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
