diff options
| author | Ken Martin <ken.martin@kitware.com> | 2001-05-17 16:08:46 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2001-05-17 16:08:46 (GMT) |
| commit | aa72e182fe88aeacb4a812c1041499973922d3cd (patch) | |
| tree | 34b6e83f91a1427718f1d68f4cbc323d76c2b8db /Source/cmMakefile.cxx | |
| parent | e093e4a4e001cd620e36d30eb05d44210117e6f9 (diff) | |
| download | CMake-aa72e182fe88aeacb4a812c1041499973922d3cd.zip CMake-aa72e182fe88aeacb4a812c1041499973922d3cd.tar.gz CMake-aa72e182fe88aeacb4a812c1041499973922d3cd.tar.bz2 | |
half checked in changes for CMAKE_ROOT
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 73f92a2..436146c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -64,6 +64,13 @@ cmMakefile::cmMakefile() this->AddDefaultCommands(); this->AddDefaultDefinitions(); cmCacheManager::GetInstance()->DefineCache(this); +#if defined(_WIN32) && !defined(__CYGWIN__) + const char* cacheValue + = cmCacheManager::GetInstance()->GetCacheValue("CMAKE_ROOT"); + std::string fpath = cacheValue; + fpath += "/Templates/CMakeWindowsSystemConfig.cmake"; + this->ReadListFile(NULL,fpath.c_str()); +#endif } void cmMakefile::AddDefaultCommands() @@ -854,11 +861,6 @@ void cmMakefile::SetHomeDirectory(const char* dir) m_cmHomeDirectory = dir; cmSystemTools::ConvertToUnixSlashes(m_cmHomeDirectory); this->AddDefinition("CMAKE_SOURCE_DIR", this->GetHomeDirectory()); -#if defined(_WIN32) && !defined(__CYGWIN__) - std::string fpath = dir; - fpath += "/CMake/CMakeWindowsSystemConfig.cmake"; - this->ReadListFile(NULL,fpath.c_str()); -#endif } void cmMakefile::SetHomeOutputDirectory(const char* lib) |