diff options
| author | Ken Martin <ken.martin@kitware.com> | 2002-09-17 17:59:58 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2002-09-17 17:59:58 (GMT) |
| commit | 2a68d21e8550b64641769b11691d74ae9bb37217 (patch) | |
| tree | 311f400a6633897fdeab49470985d19dbd78dfe6 /Source/cmMakefile.cxx | |
| parent | e68e917d9fbfa88426d3fc69f9eab4f36e9c585d (diff) | |
| download | CMake-2a68d21e8550b64641769b11691d74ae9bb37217.zip CMake-2a68d21e8550b64641769b11691d74ae9bb37217.tar.gz CMake-2a68d21e8550b64641769b11691d74ae9bb37217.tar.bz2 | |
cleaned up some of the cmake interface
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index fb4e06a..f1d706e 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1352,7 +1352,6 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir, // be run that way but the cmake object requires a vailid path std::string cmakeCommand = this->GetDefinition("CMAKE_COMMAND"); cmake cm; - cm.AddCMakePaths(cmakeCommand.c_str()); cm.SetIsInTryCompile(true); cmGlobalGenerator *gg = cm.CreateGlobalGenerator(m_LocalGenerator->GetGlobalGenerator()->GetName()); @@ -1371,12 +1370,14 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir, cm.SetHomeOutputDirectory(bindir); cm.SetStartDirectory(srcdir); cm.SetStartOutputDirectory(bindir); + cm.SetCMakeCommand(cmakeCommand.c_str()); + cm.LoadCache(); // to save time we pass the EnableLanguage info directly gg->EnableLanguagesFromGenerator(m_LocalGenerator->GetGlobalGenerator(), this); - if (cm.Configure(cmakeCommand.c_str()) != 0) + if (cm.Configure() != 0) { cmSystemTools::Error( "Internal CMake error, TryCompile configure of cmake failed"); |