summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-11-12 19:06:02 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-11-12 19:06:02 (GMT)
commit467fa9dfb3ecfb72a10b92edb8a4b53244e0562d (patch)
treefc39123c237c8820971d4c2ace79af5529e7116d /Source/cmGlobalVisualStudio6Generator.cxx
parent37149fc5b325e3c8b6558ccb4f1b793a6e04d7e9 (diff)
downloadCMake-467fa9dfb3ecfb72a10b92edb8a4b53244e0562d.zip
CMake-467fa9dfb3ecfb72a10b92edb8a4b53244e0562d.tar.gz
CMake-467fa9dfb3ecfb72a10b92edb8a4b53244e0562d.tar.bz2
ENH: Bug #371 - Add build configuration for try compiles using cmake variable
Diffstat (limited to 'Source/cmGlobalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio6Generator.cxx12
1 files changed, 11 insertions, 1 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,