diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-07 20:34:49 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-13 22:16:21 (GMT) |
| commit | 0aa34de5493732d219dd3f58634222677bd19e22 (patch) | |
| tree | fce3f2456ca397886c652f432f31da001c9f5b4d | |
| parent | 20b95ef8c83fbcb7705e72c85c9de18ff420562f (diff) | |
| download | CMake-0aa34de5493732d219dd3f58634222677bd19e22.zip CMake-0aa34de5493732d219dd3f58634222677bd19e22.tar.gz CMake-0aa34de5493732d219dd3f58634222677bd19e22.tar.bz2 | |
cmState: Initialize properties immediately.
Don't leave this as cmMakefile responsibility.
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmState.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 22d24d7..3f94125 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -55,8 +55,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, this->SuppressWatches = false; - // Setup the default include file regular expression (match everything). - this->SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$"); // Setup the default include complaint regular expression (match nothing). this->ComplainFileRegularExpression = "^$"; // Source and header file extensions that we can handle diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 364b75e..01fd4e2 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1381,6 +1381,10 @@ void cmState::Snapshot::SetDefaultDefinitions() this->SetDefinition("CMAKE_FILES_DIRECTORY", cmake::GetCMakeFilesDirectory()); + + // Setup the default include file regular expression (match everything). + this->Position->BuildSystemDirectory + ->Properties.SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$"); } void cmState::Snapshot::SetDirectoryDefinitions() |