diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-07 20:45:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-13 15:44:16 (GMT) |
| commit | f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (patch) | |
| tree | a2aad443ecfe835aaa3eaa1d4dd95fc34d94f59f /Source/cmGlobalGenerator.cxx | |
| parent | f71fdf0ec8289ada5b32b784bc2f6f617538ce0b (diff) | |
| download | CMake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.zip CMake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.tar.gz CMake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.tar.bz2 | |
cmState: Move CacheEntryType enum from cmCacheManager.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index f6ec643..4a93446 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -311,7 +311,7 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf) makeProgram += saveFile; mf->AddCacheDefinition("CMAKE_MAKE_PROGRAM", makeProgram.c_str(), "make program", - cmCacheManager::FILEPATH); + cmState::FILEPATH); } } @@ -1116,7 +1116,7 @@ void cmGlobalGenerator::Configure() sprintf(num,"%d",static_cast<int>(this->LocalGenerators.size())); this->GetCMakeInstance()->AddCacheEntry ("CMAKE_NUMBER_OF_LOCAL_GENERATORS", num, - "number of local generators", cmCacheManager::INTERNAL); + "number of local generators", cmState::INTERNAL); // check for link libraries and include directories containing "NOTFOUND" // and for infinite loops @@ -1894,7 +1894,7 @@ void cmGlobalGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator *gen, gen->GetCMakeInstance()->GetCacheDefinition("CMAKE_MAKE_PROGRAM"); this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM", make, "make program", - cmCacheManager::FILEPATH); + cmState::FILEPATH); // copy the enabled languages this->LanguageEnabled = gen->LanguageEnabled; this->LanguagesReady = gen->LanguagesReady; |