diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-13 15:45:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-13 15:45:02 (GMT) |
| commit | 62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3 (patch) | |
| tree | 8ca950377efbfd2cf90c7fe61eb7ff566a121d5e /Source/cmMakefile.h | |
| parent | 92d61798937e42ecb7ae3d1be8b2b4ab7ce15fcb (diff) | |
| parent | f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (diff) | |
| download | CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.zip CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.tar.gz CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.tar.bz2 | |
Merge topic 'introduce-cmState'
f081c5bd cmState: Move CacheEntryType enum from cmCacheManager.
f71fdf0e cmMakefile: Remove unused CacheManager accessor.
ff7169a0 Port to cmState.
a6b1ad13 Introduce cmState class.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index b78f921..57a4180 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -12,7 +12,6 @@ #ifndef cmMakefile_h #define cmMakefile_h -#include "cmCacheManager.h" #include "cmExecutionStatus.h" #include "cmListFileCache.h" #include "cmPolicies.h" @@ -23,6 +22,7 @@ #include "cmGeneratorTarget.h" #include "cmExpandedCommandArgument.h" #include "cmake.h" +#include "cmState.h" #if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmSourceGroup.h" @@ -305,7 +305,7 @@ public: ///! Add a definition to this makefile and the global cmake cache. void AddCacheDefinition(const std::string& name, const char* value, const char* doc, - cmCacheManager::CacheEntryType type, + cmState::CacheEntryType type, bool force = false); /** @@ -758,7 +758,7 @@ public: ///enabled. void EnableLanguage(std::vector<std::string>const& languages, bool optional); - cmCacheManager *GetCacheManager() const; + cmState *GetState() const; /** * Get the variable watch. This is used to determine when certain variables |