浏览代码

cmState: Initialize properties immediately.

Don't leave this as cmMakefile responsibility.
Stephen Kelly 10 年之前
父节点
当前提交
0aa34de549
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 0 2
      Source/cmMakefile.cxx
  2. 4 0
      Source/cmState.cxx

+ 0 - 2
Source/cmMakefile.cxx

@@ -55,8 +55,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 
 
   this->SuppressWatches = false;
   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).
   // Setup the default include complaint regular expression (match nothing).
   this->ComplainFileRegularExpression = "^$";
   this->ComplainFileRegularExpression = "^$";
   // Source and header file extensions that we can handle
   // Source and header file extensions that we can handle

+ 4 - 0
Source/cmState.cxx

@@ -1381,6 +1381,10 @@ void cmState::Snapshot::SetDefaultDefinitions()
 
 
     this->SetDefinition("CMAKE_FILES_DIRECTORY",
     this->SetDefinition("CMAKE_FILES_DIRECTORY",
                         cmake::GetCMakeFilesDirectory());
                         cmake::GetCMakeFilesDirectory());
+
+  // Setup the default include file regular expression (match everything).
+  this->Position->BuildSystemDirectory
+      ->Properties.SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$");
 }
 }
 
 
 void cmState::Snapshot::SetDirectoryDefinitions()
 void cmState::Snapshot::SetDirectoryDefinitions()