diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-24 13:17:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-01-24 13:20:19 (GMT) |
| commit | 2d64f9f08dab62a3aa2215e0ed8f3dd8bcdc1fbf (patch) | |
| tree | 530d24b3d664f16d90273a9644a9a37f0e8a365d /Source | |
| parent | 1345bdf1b6520a2f0c9891ad3c6fee00a6a5f18d (diff) | |
| download | CMake-2d64f9f08dab62a3aa2215e0ed8f3dd8bcdc1fbf.zip CMake-2d64f9f08dab62a3aa2215e0ed8f3dd8bcdc1fbf.tar.gz CMake-2d64f9f08dab62a3aa2215e0ed8f3dd8bcdc1fbf.tar.bz2 | |
include_regular_expression: Fix propagation to subdirectories
Refactoring in commit v3.4.0-rc1~321^2 (cmMakefile: Remove special
handling of INCLUDE_REGULAR_EXPRESSION, 2015-04-04) accidentally broke
propagation of the include regex to subdirectories. Refactoring in
commit v3.5.0-rc1~319^2~1 (cmState: Initialize properties immediately,
2015-10-07) moved maintenance of this value from `cmMakefile` to
`cmStateSnapshot`.
Restore propagation of the `INCLUDE_REGULAR_EXPRESSION` to
subdirectories and add a test to cover it.
Fixes: #17676
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmStateSnapshot.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index bdef3e5..479ecd2 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -386,6 +386,12 @@ void cmStateSnapshot::InitializeFromParent() parent->BuildSystemDirectory->CompileOptionsBacktraces, this->Position->BuildSystemDirectory->CompileOptionsBacktraces, this->Position->CompileOptionsPosition); + + const char* include_regex = + parent->BuildSystemDirectory->Properties.GetPropertyValue( + "INCLUDE_REGULAR_EXPRESSION"); + this->Position->BuildSystemDirectory->Properties.SetProperty( + "INCLUDE_REGULAR_EXPRESSION", include_regex); } cmState* cmStateSnapshot::GetState() const |