diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-11 14:58:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-11 14:58:52 (GMT) |
| commit | 9a670222758bff23645df36a5cb9d98cb1bafa8e (patch) | |
| tree | d8140f377ab957ac0aeb2a15ed20e322b3ad9c94 | |
| parent | bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (diff) | |
| parent | b8968b4b3984b425497324c302948a197b2badbd (diff) | |
| download | CMake-9a670222758bff23645df36a5cb9d98cb1bafa8e.zip CMake-9a670222758bff23645df36a5cb9d98cb1bafa8e.tar.gz CMake-9a670222758bff23645df36a5cb9d98cb1bafa8e.tar.bz2 | |
Merge topic 'UseSWIG-implicit-depends'
b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
| -rw-r--r-- | Copyright.txt | 2 | ||||
| -rw-r--r-- | Modules/UseSWIG.cmake | 1 | ||||
| -rw-r--r-- | Source/cmDependsC.cxx | 4 |
3 files changed, 5 insertions, 2 deletions
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 <solo@altlinux.ru> * Alexander Neundorf <neundorf@kde.org> * Alexander Smorkalov <alexander.smorkalov@itseez.com> +* Alexey Sokolov <sokolov@google.com> * Alex Turbov <i.zaufi@gmail.com> * Andreas Pakulat <apaku@gmx.de> * Andreas Schneider <asn@cryptomilk.org> @@ -54,6 +55,7 @@ The following individuals and institutions are among the Contributors: * Eran Ifrah <eran.ifrah@gmail.com> * Esben Mose Hansen, Ange Optimization ApS * Geoffrey Viola <geoffrey.viola@asirobots.com> +* Google Inc * Gregor Jasny * Helio Chissini de Castro <helio@kde.org> * Ilya Lavrenov <ilya.lavrenov@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) { |