[Cmake-commits] [cmake-commits] king committed cmExportFileGenerator.cxx 1.12 1.13

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Mar 31 13:48:52 EDT 2008


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv32329/Source

Modified Files:
	cmExportFileGenerator.cxx 
Log Message:
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.


Index: cmExportFileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExportFileGenerator.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmExportFileGenerator.cxx	13 Mar 2008 21:04:32 -0000	1.12
--- cmExportFileGenerator.cxx	31 Mar 2008 17:48:50 -0000	1.13
***************
*** 80,89 ****
    std::ostream& os = *foutPtr;
  
!   // Start with the import file header.
    os << "CMAKE_POLICY(PUSH)\n"
!      << "CMAKE_POLICY(VERSION "
!      << cmVersion::GetMajorVersion() << "."
!      << cmVersion::GetMinorVersion() << "."
!      << cmVersion::GetPatchVersion() << ")\n";
    this->GenerateImportHeaderCode(os);
  
--- 80,91 ----
    std::ostream& os = *foutPtr;
  
!   // 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"
!      << "CMAKE_POLICY(VERSION 2.6)\n";
! 
!   // Start with the import file header.
    this->GenerateImportHeaderCode(os);
  



More information about the Cmake-commits mailing list