diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-01 00:34:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-01 00:34:57 (GMT) |
| commit | 73284a1c12c6707b802233111a7c1e5e18c94c14 (patch) | |
| tree | 497a3ecdaeec475327f86c42f4fdb0e91da9c599 /Source/cmake.cxx | |
| parent | 576d8b41cb10428a227c0f75ed8cc6d0a37fcd05 (diff) | |
| download | CMake-73284a1c12c6707b802233111a7c1e5e18c94c14.zip CMake-73284a1c12c6707b802233111a7c1e5e18c94c14.tar.gz CMake-73284a1c12c6707b802233111a7c1e5e18c94c14.tar.bz2 | |
ENH: Enabled build of VS 7 and 8 generators for MinGW.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a10b1ae..da39732 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -43,13 +43,11 @@ // include the generator #if defined(_WIN32) && !defined(__CYGWIN__) -# if !defined(__MINGW32__) +# if !defined(CMAKE_BOOT_MINGW) +# include "cmGlobalVisualStudio6Generator.h" # include "cmGlobalVisualStudio7Generator.h" # include "cmGlobalVisualStudio71Generator.h" # include "cmGlobalVisualStudio8Generator.h" -# endif -# if !defined(CMAKE_BOOT_MINGW) -# include "cmGlobalVisualStudio6Generator.h" # include "cmGlobalBorlandMakefileGenerator.h" # include "cmGlobalNMakeMakefileGenerator.h" # include "cmGlobalWatcomWMakeGenerator.h" @@ -1599,24 +1597,22 @@ void cmake::AddDefaultCommands() void cmake::AddDefaultGenerators() { #if defined(_WIN32) && !defined(__CYGWIN__) -#if !defined(__MINGW32__) +# if !defined(CMAKE_BOOT_MINGW) + m_Generators[cmGlobalVisualStudio6Generator::GetActualName()] = + &cmGlobalVisualStudio6Generator::New; m_Generators[cmGlobalVisualStudio7Generator::GetActualName()] = &cmGlobalVisualStudio7Generator::New; m_Generators[cmGlobalVisualStudio71Generator::GetActualName()] = &cmGlobalVisualStudio71Generator::New; m_Generators[cmGlobalVisualStudio8Generator::GetActualName()] = &cmGlobalVisualStudio8Generator::New; -#endif -#if !defined(CMAKE_BOOT_MINGW) - m_Generators[cmGlobalVisualStudio6Generator::GetActualName()] = - &cmGlobalVisualStudio6Generator::New; m_Generators[cmGlobalBorlandMakefileGenerator::GetActualName()] = &cmGlobalBorlandMakefileGenerator::New; m_Generators[cmGlobalNMakeMakefileGenerator::GetActualName()] = &cmGlobalNMakeMakefileGenerator::New; m_Generators[cmGlobalWatcomWMakeGenerator::GetActualName()] = &cmGlobalWatcomWMakeGenerator::New; -#endif +# endif m_Generators[cmGlobalMSYSMakefileGenerator::GetActualName()] = &cmGlobalMSYSMakefileGenerator::New; m_Generators[cmGlobalMinGWMakefileGenerator::GetActualName()] = |