瀏覽代碼

BUG: fix VSExternal for visual studio 6

Ken Martin 21 年之前
父節點
當前提交
cf7893b934
共有 2 個文件被更改,包括 10 次插入4 次删除
  1. 9 3
      Source/cmGlobalVisualStudio6Generator.cxx
  2. 1 1
      Tests/VSExternalInclude/CMakeLists.txt

+ 9 - 3
Source/cmGlobalVisualStudio6Generator.cxx

@@ -477,9 +477,9 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
         const char* cacheValue
           = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
         if(cacheValue && *cacheValue)
-          {
+          { 
           fout << "Begin Project Dependency\n";
-          fout << "Project_Dep_Name " << j->first << "\n";
+          fout << "Project_Dep_Name " << j->first.c_str() << "\n";
           fout << "End Project Dependency\n";
           }
         }
@@ -494,8 +494,14 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     {
     if(*i != dspname)
       {
+      std::string depName = *i;
+      if(strncmp(depName.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
+        {
+        depName.erase(depName.begin(), depName.begin() + 27);
+        }
+          
       fout << "Begin Project Dependency\n";
-      fout << "Project_Dep_Name " << *i << "\n";
+      fout << "Project_Dep_Name " << depName << "\n";
       fout << "End Project Dependency\n";
       }
     }

+ 1 - 1
Tests/VSExternalInclude/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(VSExternalInclude)
 
 IF(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
-  SET(PROJECT_EXT dps)
+  SET(PROJECT_EXT dsp)
 ELSE(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
   SET(PROJECT_EXT vcproj)
 ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")