summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-12-18 18:17:36 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-12-18 18:17:36 (GMT)
commit72d8bd1e411d4f1f1bbe4146e91d66114e1c7110 (patch)
tree05b3674c5950ac9aa16459588f3a196f1beb3725 /Source/cmLocalVisualStudio6Generator.cxx
parentc3840b5cc3e26886bab16faf7e27a4ef80f3686d (diff)
downloadCMake-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/cmLocalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio6Generator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 13891ba..cb4e94e 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -471,7 +471,7 @@ void cmLocalVisualStudio6Generator::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"))
@@ -877,7 +877,7 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
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") )
{
libDebug += m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
}