diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-11-12 19:06:02 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-11-12 19:06:02 (GMT) |
| commit | 467fa9dfb3ecfb72a10b92edb8a4b53244e0562d (patch) | |
| tree | fc39123c237c8820971d4c2ace79af5529e7116d | |
| parent | 37149fc5b325e3c8b6558ccb4f1b793a6e04d7e9 (diff) | |
| download | CMake-467fa9dfb3ecfb72a10b92edb8a4b53244e0562d.zip CMake-467fa9dfb3ecfb72a10b92edb8a4b53244e0562d.tar.gz CMake-467fa9dfb3ecfb72a10b92edb8a4b53244e0562d.tar.bz2 | |
ENH: Bug #371 - Add build configuration for try compiles using cmake variable
| -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; |