summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-05-02 15:53:39 (GMT)
committerKen Martin <ken.martin@kitware.com>2001-05-02 15:53:39 (GMT)
commitd649156aa1d911e4cfa8546a960bc4461b85ff2b (patch)
tree48899e33e2011ce63cf3d77573c977cf28cd245f /Source
parent6d5508e64b970d0e0b3efa3625e9b7dddefc2566 (diff)
downloadCMake-d649156aa1d911e4cfa8546a960bc4461b85ff2b.zip
CMake-d649156aa1d911e4cfa8546a960bc4461b85ff2b.tar.gz
CMake-d649156aa1d911e4cfa8546a960bc4461b85ff2b.tar.bz2
cache loaded into makefile
Diffstat (limited to 'Source')
-rw-r--r--Source/CMakeBuildTargets.cxx1
-rw-r--r--Source/CMakeSetupCMD.cxx1
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/CMakeBuildTargets.cxx b/Source/CMakeBuildTargets.cxx
index 093fcf5..4626ccf 100644
--- a/Source/CMakeBuildTargets.cxx
+++ b/Source/CMakeBuildTargets.cxx
@@ -116,6 +116,7 @@ int main(int ac, char** av)
// Read and parse the input makefile
mf.MakeStartDirectoriesCurrent();
cmCacheManager::GetInstance()->LoadCache(&mf);
+ cmCacheManager::GetInstance()->DefineCache(&mf);
if(!mf.ReadListFile(av[1]))
{
Usage(av[0]);
diff --git a/Source/CMakeSetupCMD.cxx b/Source/CMakeSetupCMD.cxx
index 0c8ff43..64a63eb 100644
--- a/Source/CMakeSetupCMD.cxx
+++ b/Source/CMakeSetupCMD.cxx
@@ -104,6 +104,7 @@ int main(int ac, char** av)
makefile.SetMakefileGenerator(pg);
makefile.MakeStartDirectoriesCurrent();
cmCacheManager::GetInstance()->LoadCache(&makefile);
+ cmCacheManager::GetInstance()->DefineCache(&makefile);
makefile.ReadListFile(av[1]);
makefile.GenerateMakefile();
cmCacheManager::GetInstance()->SaveCache(&makefile);