From d649156aa1d911e4cfa8546a960bc4461b85ff2b Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Wed, 2 May 2001 11:53:39 -0400 Subject: [PATCH] cache loaded into makefile --- Source/CMakeBuildTargets.cxx | 1 + Source/CMakeSetupCMD.cxx | 1 + 2 files changed, 2 insertions(+) diff --git a/Source/CMakeBuildTargets.cxx b/Source/CMakeBuildTargets.cxx index 093fcf510..4626ccfd5 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 0c8ff4338..64a63eb5a 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);