diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-12-18 18:17:36 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-12-18 18:17:36 (GMT) |
| commit | 72d8bd1e411d4f1f1bbe4146e91d66114e1c7110 (patch) | |
| tree | 05b3674c5950ac9aa16459588f3a196f1beb3725 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | c3840b5cc3e26886bab16faf7e27a4ef80f3686d (diff) | |
| download | CMake-72d8bd1e411d4f1f1bbe4146e91d66114e1c7110.zip CMake-72d8bd1e411d4f1f1bbe4146e91d66114e1c7110.tar.gz CMake-72d8bd1e411d4f1f1bbe4146e91d66114e1c7110.tar.bz2 | |
BUG: Fix Bug #445 - Same library in multiple projects can cause problems
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 5927cea..eab8281 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -685,7 +685,7 @@ void cmLocalVisualStudio7Generator::OutputLibraries(std::ostream& fout, std::string libPath = j->first + "_CMAKE_PATH"; const char* cacheValue = m_GlobalGenerator->GetCMakeInstance()->GetCacheDefinition(libPath.c_str()); - if(cacheValue && m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX")) + if(cacheValue && *cacheValue && m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX")) { debugPostfix = m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX"); } @@ -956,7 +956,7 @@ WriteCustomRule(std::ostream& fout, } std::string libPath = dep + "_CMAKE_PATH"; const char* cacheValue = m_Makefile->GetDefinition(libPath.c_str()); - if (cacheValue) + if (cacheValue && *cacheValue) { std::string exePath = ""; if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH")) |