BUG: Fix Bug #445 - Same library in multiple projects can cause problems

7 files changed, 12 insertions, 12 deletions

diff --git a/Source/cmGlobalCodeWarriorGenerator.cxx b/Source/cmGlobalCodeWarriorGenerator.cxx
index 91ff5b3e35..c37d2eef85 100644
--- a/Source/cmGlobalCodeWarriorGenerator.cxx
+++ b/Source/cmGlobalCodeWarriorGenerator.cxx
@@ -229,7 +229,7 @@ void cmGlobalCodeWarriorGenerator::ComputeTargetOrder(
       std::string libPath = j->first + "_CMAKE_PATH";
       const char* cacheValue
         = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
-      if(cacheValue)
+      if(cacheValue && *cacheValue)
         {
         // so add it to the tgtOrder vector if it isn't already there
         // to do this we need the actual target
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index ca53dbbdcf..1ae06d8f21 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -452,7 +452,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
         std::string libPath = j->first + "_CMAKE_PATH";
         const char* cacheValue
           = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
-        if(cacheValue)
+        if(cacheValue && *cacheValue)
           {
           fout << "Begin Project Dependency\n";
           fout << "Project_Dep_Name " << j->first << "\n";
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 52c705aa9a..9055ccb491 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -248,7 +248,7 @@ void cmGlobalVisualStudio71Generator::WriteProjectDepends(std::ostream& fout,
         std::string libPath = j->first + "_CMAKE_PATH";
         const char* cacheValue
           = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
-        if(cacheValue)
+        if(cacheValue && *cacheValue)
           {
           fout << "\t\t{" << this->CreateGUID(j->first.c_str()) << "} = {"
                << this->CreateGUID(j->first.c_str()) << "}\n";
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 07e03376e8..e302718862 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -534,7 +534,7 @@ void cmGlobalVisualStudio7Generator::WriteProjectDepends(std::ostream& fout,
         std::string libPath = j->first + "_CMAKE_PATH";
         const char* cacheValue
           = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
-        if(cacheValue)
+        if(cacheValue && *cacheValue)
           {
           fout << "\t\t{" << this->CreateGUID(dspname) << "}." << depcount << " = {"
                << this->CreateGUID(j->first.c_str()) << "}\n";
diff --git a/Source/cmLocalCodeWarriorGenerator.cxx b/Source/cmLocalCodeWarriorGenerator.cxx
index ef5ee307d5..ba66c656a4 100644
--- a/Source/cmLocalCodeWarriorGenerator.cxx
+++ b/Source/cmLocalCodeWarriorGenerator.cxx
@@ -189,7 +189,7 @@ void cmLocalCodeWarriorGenerator::WriteSettingList(std::ostream& fout,
       = GetGlobalGenerator()->GetCMakeInstance()
       ->GetCacheDefinition(libPath.c_str());
 
-    if( cacheValue )
+    if( cacheValue && *cacheValue )
       {
       // just tack it on
       fout << "<SETTING>\n";
@@ -585,7 +585,7 @@ void cmLocalCodeWarriorGenerator::WriteFileList(std::ostream& fout,
       = GetGlobalGenerator()->GetCMakeInstance()
       ->GetCacheDefinition(libPath.c_str());
 
-    if( cacheValue )
+    if( cacheValue && *cacheValue )
       {
       // just tack it on
       fout << "<FILE>\n";
@@ -718,7 +718,7 @@ void cmLocalCodeWarriorGenerator::WriteLinkOrder(std::ostream& fout,
       = GetGlobalGenerator()->GetCMakeInstance()
       ->GetCacheDefinition(libPath.c_str());
 
-    if( cacheValue )
+    if( cacheValue && *cacheValue ) 
       {
       // just tack it on
       fout << "<FILEREF>\n";
@@ -988,7 +988,7 @@ void cmLocalCodeWarriorGenerator::WriteGroup(std::ostream& fout,
       = GetGlobalGenerator()->GetCMakeInstance()
       ->GetCacheDefinition(libPath.c_str());
 
-    if( cacheValue )
+    if( cacheValue && *cacheValue )
       {
       // this is a subtarget reference, it will be taken care of later
       continue;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 13891ba4aa..cb4e94ec58 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");
         }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5927cea2d3..eab8281bdd 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"))