diff options
| author | Brad King <brad.king@kitware.com> | 2004-08-04 16:33:10 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2004-08-04 16:33:10 -0400 |
| commit | 9b1771aef4c38d2b536d1b2306b62c1b2c27266e (patch) | |
| tree | 4db25f1fb06ee22705bef16f70b1a9bbd852847a /Source/cmGlobalVisualStudio6Generator.cxx | |
| parent | f99d94891680c9b14a91579bc4e96b89c9246656 (diff) | |
| download | cmake-9b1771aef4c38d2b536d1b2306b62c1b2c27266e.tar.gz | |
BUG: CMAKE_TRY_COMPILE_CONFIGURATION should be obtained from the cmMakefile instance for the listfile containing the TRY_COMPILE call, not the top level listfile.
Diffstat (limited to 'Source/cmGlobalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index f4ae839bc0..5dfda72c40 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -68,7 +68,8 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *, const char *bindir, const char *projectName, const char *targetName, - std::string *output) + std::string *output, + cmMakefile* mf) { // now build the test std::string makeCommand = @@ -115,10 +116,9 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *, makeCommand += "ALL_BUILD"; } makeCommand += " - "; - if ( m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION") ) + if(const char* config = mf->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION")) { - makeCommand += - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION"); + makeCommand += config; } else { |