diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-25 13:30:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-25 13:31:03 (GMT) |
| commit | 03050c5689f5b6bd91b378316a919018629133fc (patch) | |
| tree | 79bb6290d068fd62e9315377f5f7a6a6111493d7 /Source | |
| parent | 312512e2baa608e0eaaaa893114f07e40044f8b2 (diff) | |
| parent | 2d64f9f08dab62a3aa2215e0ed8f3dd8bcdc1fbf (diff) | |
| download | CMake-03050c5689f5b6bd91b378316a919018629133fc.zip CMake-03050c5689f5b6bd91b378316a919018629133fc.tar.gz CMake-03050c5689f5b6bd91b378316a919018629133fc.tar.bz2 | |
Merge topic 'fix-include_regular_expression-subdir'
2d64f9f0 include_regular_expression: Fix propagation to subdirectories
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1690
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 |