diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-12-22 21:42:36 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-12-22 21:42:36 (GMT) |
| commit | f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3 (patch) | |
| tree | 4e64e8bb66e869ac393a25d758dda54d55838615 /Source/cmake.cxx | |
| parent | 001bbb0d99aa8a02c5d211f5e55570ecc17e1fb0 (diff) | |
| download | CMake-f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3.zip CMake-f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3.tar.gz CMake-f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3.tar.bz2 | |
ENH: fix borland make clean targets before build, add new generators for msys and mingw
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index e6fac5e..920291b 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -47,6 +47,8 @@ # endif # include "cmGlobalBorlandMakefileGenerator.h" # include "cmGlobalNMakeMakefileGenerator.h" +# include "cmGlobalMSYSMakefileGenerator.h" +# include "cmGlobalMinGWMakefileGenerator.h" # include "cmWin32ProcessExecution.h" #else #endif @@ -932,9 +934,9 @@ int cmake::CMakeCommand(std::vector<std::string>& args) { cmake cm; cmGlobalGenerator *ggd = cm.CreateGlobalGenerator(args[2].c_str()); - ggd->SetCMakeInstance(&cm); if (ggd) { + ggd->SetCMakeInstance(&cm); std::auto_ptr<cmLocalGenerator> lgd(ggd->CreateLocalGenerator()); lgd->SetGlobalGenerator(ggd); return lgd->ScanDependencies(args)? 0 : 2; @@ -1541,6 +1543,10 @@ void cmake::AddDefaultGenerators() &cmGlobalBorlandMakefileGenerator::New; m_Generators[cmGlobalNMakeMakefileGenerator::GetActualName()] = &cmGlobalNMakeMakefileGenerator::New; + m_Generators[cmGlobalMSYSMakefileGenerator::GetActualName()] = + &cmGlobalMSYSMakefileGenerator::New; + m_Generators[cmGlobalMinGWMakefileGenerator::GetActualName()] = + &cmGlobalMinGWMakefileGenerator::New; #endif m_Generators[cmGlobalUnixMakefileGenerator3::GetActualName()] = &cmGlobalUnixMakefileGenerator3::New; |