diff options
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 12 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index b04713a..75b7467 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -114,7 +114,17 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *, { makeCommand += "ALL_BUILD"; } - makeCommand += " - Debug\""; + makeCommand += " - "; + if ( m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION") ) + { + makeCommand += + m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION"); + } + else + { + makeCommand += "Debug"; + } + makeCommand += "\""; int retVal; int timeout = cmGlobalGenerator::s_TryCompileTimeout; if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), output, diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 11032ce..5435190 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -75,7 +75,17 @@ int cmGlobalVisualStudio7Generator::TryCompile(const char *, #endif makeCommand += " "; makeCommand += projectName; - makeCommand += ".sln /build Debug /project "; + makeCommand += ".sln /build "; + if ( m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION") ) + { + makeCommand += + m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION"); + } + else + { + makeCommand += "Debug"; + } + makeCommand += " /project "; if (targetName) { makeCommand += targetName; |