diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-21 13:22:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-21 13:22:15 (GMT) |
| commit | 64aa41b2480384be22881a3bacc8960ec57b0f11 (patch) | |
| tree | 36b5c7f89b29798065ac8a1d1804f8c71e6fdebd /Source/cmMakefile.h | |
| parent | ce597a022b32231559c75843f4df6108120c5d57 (diff) | |
| parent | 4efda261fead9f677144ffc6bc2b612a1d1dbcb6 (diff) | |
| download | CMake-64aa41b2480384be22881a3bacc8960ec57b0f11.zip CMake-64aa41b2480384be22881a3bacc8960ec57b0f11.tar.gz CMake-64aa41b2480384be22881a3bacc8960ec57b0f11.tar.bz2 | |
Merge topic 'clean-up-include_regular_expression'
4efda261 cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 415b5fe..76f3fbe 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -387,11 +387,11 @@ public: */ void SetIncludeRegularExpression(const char* regex) { - this->IncludeFileRegularExpression = regex; + this->SetProperty("INCLUDE_REGULAR_EXPRESSION", regex); } const char* GetIncludeRegularExpression() const { - return this->IncludeFileRegularExpression.c_str(); + return this->GetProperty("INCLUDE_REGULAR_EXPRESSION"); } /** @@ -873,7 +873,6 @@ protected: std::vector<cmInstallGenerator*> InstallGenerators; std::vector<cmTestGenerator*> TestGenerators; - std::string IncludeFileRegularExpression; std::string ComplainFileRegularExpression; std::vector<std::string> SourceFileExtensions; std::vector<std::string> HeaderFileExtensions; |