diff options
| author | Brad King <brad.king@kitware.com> | 2004-08-04 20:33:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2004-08-04 20:33:10 (GMT) |
| commit | 9b1771aef4c38d2b536d1b2306b62c1b2c27266e (patch) | |
| tree | 4db25f1fb06ee22705bef16f70b1a9bbd852847a /Source/cmGlobalVisualStudio7Generator.cxx | |
| parent | f99d94891680c9b14a91579bc4e96b89c9246656 (diff) | |
| download | CMake-9b1771aef4c38d2b536d1b2306b62c1b2c27266e.zip CMake-9b1771aef4c38d2b536d1b2306b62c1b2c27266e.tar.gz CMake-9b1771aef4c38d2b536d1b2306b62c1b2c27266e.tar.bz2 | |
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/cmGlobalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index d7301a0..b8fa1af 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -44,7 +44,8 @@ int cmGlobalVisualStudio7Generator::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 = @@ -77,10 +78,9 @@ int cmGlobalVisualStudio7Generator::TryCompile(const char *, makeCommand += " "; makeCommand += projectName; makeCommand += ".sln /build "; - 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 { |