Browse Source

BUG: Generated target export files should set the policy version to 2.6 instead of the currently running version because they are 2.6 compatible.

Brad King 17 năm trước cách đây
mục cha
commit
6d064999f6
1 tập tin đã thay đổi với 7 bổ sung5 xóa
  1. 7 5
      Source/cmExportFileGenerator.cxx

+ 7 - 5
Source/cmExportFileGenerator.cxx

@@ -79,12 +79,14 @@ bool cmExportFileGenerator::GenerateImportFile()
     }
     }
   std::ostream& os = *foutPtr;
   std::ostream& os = *foutPtr;
 
 
-  // Start with the import file header.
+  // Isolate the file policy level.
+  // We use 2.6 here instead of the current version because newer
+  // versions of CMake should be able to export files imported by 2.6
+  // until the import format changes.
   os << "CMAKE_POLICY(PUSH)\n"
   os << "CMAKE_POLICY(PUSH)\n"
-     << "CMAKE_POLICY(VERSION "
-     << cmVersion::GetMajorVersion() << "."
-     << cmVersion::GetMinorVersion() << "."
-     << cmVersion::GetPatchVersion() << ")\n";
+     << "CMAKE_POLICY(VERSION 2.6)\n";
+
+  // Start with the import file header.
   this->GenerateImportHeaderCode(os);
   this->GenerateImportHeaderCode(os);
 
 
   // Create all the imported targets.
   // Create all the imported targets.