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, next has been updated
via 14f8a662df08f79471f199ff40444593933e509d (commit)
via b8968b4b3984b425497324c302948a197b2badbd (commit)
from 31e1ebf7015852bae9dbc5204e37534ae29c8548 (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=14f8a662df08f79471f199ff40444593933e509d
commit 14f8a662df08f79471f199ff40444593933e509d
Merge: 31e1ebf b8968b4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 13:07:53 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 13:07:53 2017 -0500
Merge topic 'UseSWIG-implicit-depends' into next
b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for
Makefiles
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8968b4b3984b425497324c302948a197b2badbd
commit b8968b4b3984b425497324c302948a197b2badbd
Author: Alexey Sokolov <soko...@google.com>
AuthorDate: Wed Dec 21 01:53:41 2016 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 13:05:59 2017 -0500
UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
Issue: #4147
diff --git a/Copyright.txt b/Copyright.txt
index aa91102..daaa1d1 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -37,6 +37,7 @@ The following individuals and institutions are among the
Contributors:
* Aleksey Avdeev <s...@altlinux.ru>
* Alexander Neundorf <neund...@kde.org>
* Alexander Smorkalov <alexander.smorka...@itseez.com>
+* Alexey Sokolov <soko...@google.com>
* Alex Turbov <i.za...@gmail.com>
* Andreas Pakulat <ap...@gmx.de>
* Andreas Schneider <a...@cryptomilk.org>
@@ -54,6 +55,7 @@ The following individuals and institutions are among the
Contributors:
* Eran Ifrah <eran.if...@gmail.com>
* Esben Mose Hansen, Ange Optimization ApS
* Geoffrey Viola <geoffrey.vi...@asirobots.com>
+* Google Inc
* Gregor Jasny
* Helio Chissini de Castro <he...@kde.org>
* Ilya Lavrenov <ilya.lavre...@itseez.com>
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 651f9f1..ffb72a0 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -212,6 +212,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
"${swig_source_file_fullname}"
MAIN_DEPENDENCY "${swig_source_file_fullname}"
DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
+ IMPLICIT_DEPENDS CXX "${swig_source_file_fullname}"
COMMENT "Swig source")
set_source_files_properties("${swig_generated_file_fullname}"
${swig_extra_generated_files}
PROPERTIES GENERATED 1)
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index e6000db..9d4b9cc 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -12,7 +12,7 @@
#include "cmSystemTools.h"
#define INCLUDE_REGEX_LINE \
- "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
+ "^[ \t]*[#%][ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
#define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: "
#define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: "
@@ -420,7 +420,7 @@ void cmDependsC::SetupTransforms()
if (!this->TransformRules.empty()) {
// Construct the regular expression to match lines to be
// transformed.
- std::string xform = "^([ \t]*#[ \t]*(include|import)[ \t]*)(";
+ std::string xform = "^([ \t]*[#%][ \t]*(include|import)[ \t]*)(";
const char* sep = "";
for (TransformRulesType::const_iterator tri = this->TransformRules.begin();
tri != this->TransformRules.end(); ++tri) {
-----------------------------------------------------------------------
Summary of changes:
Copyright.txt | 2 ++
Modules/UseSWIG.cmake | 1 +
Source/cmDependsC.cxx | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
