forked from pool/cmake
00815a92d2
update to version 3.5.0 OBS-URL: https://build.opensuse.org/request/show/368826 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=242
96 lines
4.3 KiB
Diff
96 lines
4.3 KiB
Diff
Enclosing the cmake version will cause a republish of generated files
|
|
|
|
---
|
|
Source/CPack/IFW/cmCPackIFWGenerator.cxx | 2 +-
|
|
Source/cmExportFileGenerator.cxx | 2 +-
|
|
Source/cmExportLibraryDependenciesCommand.cxx | 2 +-
|
|
Source/cmGlobalGhsMultiGenerator.cxx | 4 ++--
|
|
Source/cmGlobalNinjaGenerator.cxx | 4 +---
|
|
Source/cmLocalUnixMakefileGenerator3.cxx | 4 +---
|
|
6 files changed, 7 insertions(+), 11 deletions(-)
|
|
|
|
Index: cmake-3.4.3/Source/CPack/IFW/cmCPackIFWGenerator.cxx
|
|
===================================================================
|
|
--- cmake-3.4.3.orig/Source/CPack/IFW/cmCPackIFWGenerator.cxx
|
|
+++ cmake-3.4.3/Source/CPack/IFW/cmCPackIFWGenerator.cxx
|
|
@@ -614,7 +614,7 @@ cmCPackIFWPackage* cmCPackIFWGenerator::
|
|
//----------------------------------------------------------------------------
|
|
void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmGeneratedFileStream &xout)
|
|
{
|
|
- xout << "<!-- Generated by CPack " << CMake_VERSION << " IFW generator "
|
|
+ xout << "<!-- Generated by CPack IFW generator "
|
|
<< "for QtIFW ";
|
|
if(IsVersionLess("2.0"))
|
|
{
|
|
Index: cmake-3.4.3/Source/cmExportFileGenerator.cxx
|
|
===================================================================
|
|
--- cmake-3.4.3.orig/Source/cmExportFileGenerator.cxx
|
|
+++ cmake-3.4.3/Source/cmExportFileGenerator.cxx
|
|
@@ -107,7 +107,7 @@ bool cmExportFileGenerator::GenerateImpo
|
|
std::ostream& os = *foutPtr;
|
|
|
|
// Protect that file against use with older CMake versions.
|
|
- os << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n";
|
|
+ os << "# Generated by CMake\n\n";
|
|
os << "if(\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" LESS 2.5)\n"
|
|
<< " message(FATAL_ERROR \"CMake >= 2.6.0 required\")\n"
|
|
<< "endif()\n";
|
|
Index: cmake-3.4.3/Source/cmExportLibraryDependenciesCommand.cxx
|
|
===================================================================
|
|
--- cmake-3.4.3.orig/Source/cmExportLibraryDependenciesCommand.cxx
|
|
+++ cmake-3.4.3/Source/cmExportLibraryDependenciesCommand.cxx
|
|
@@ -168,7 +168,7 @@ void cmExportLibraryDependenciesCommand:
|
|
// versions.
|
|
const char* vertest =
|
|
"\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" GREATER 2.4";
|
|
- fout << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n";
|
|
+ fout << "# Generated by CMake\n\n";
|
|
fout << "if(" << vertest << ")\n";
|
|
fout << " # Information for CMake 2.6 and above.\n";
|
|
for(std::map<std::string, std::string>::const_iterator
|
|
Index: cmake-3.4.3/Source/cmGlobalGhsMultiGenerator.cxx
|
|
===================================================================
|
|
--- cmake-3.4.3.orig/Source/cmGlobalGhsMultiGenerator.cxx
|
|
+++ cmake-3.4.3/Source/cmGlobalGhsMultiGenerator.cxx
|
|
@@ -365,8 +365,8 @@ void cmGlobalGhsMultiGenerator::WriteDis
|
|
(*os) << "#" << std::endl
|
|
<< "# CMAKE generated file: DO NOT EDIT!" << std::endl
|
|
<< "# Generated by \"" << GetActualName() << "\""
|
|
- << " Generator, CMake Version " << cmVersion::GetMajorVersion() << "."
|
|
- << cmVersion::GetMinorVersion() << std::endl
|
|
+ << " Generator, CMake"
|
|
+ << std::endl
|
|
<< "#" << std::endl;
|
|
}
|
|
|
|
Index: cmake-3.4.3/Source/cmGlobalNinjaGenerator.cxx
|
|
===================================================================
|
|
--- cmake-3.4.3.orig/Source/cmGlobalNinjaGenerator.cxx
|
|
+++ cmake-3.4.3/Source/cmGlobalNinjaGenerator.cxx
|
|
@@ -903,9 +903,7 @@
|
|
os
|
|
<< "# CMAKE generated file: DO NOT EDIT!\n"
|
|
<< "# Generated by \"" << this->GetName() << "\""
|
|
- << " Generator, CMake Version "
|
|
- << cmVersion::GetMajorVersion() << "."
|
|
- << cmVersion::GetMinorVersion() << "\n\n";
|
|
+ << " Generator, CMake\n\n";
|
|
}
|
|
|
|
void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
|
|
Index: cmake-3.4.3/Source/cmLocalUnixMakefileGenerator3.cxx
|
|
===================================================================
|
|
--- cmake-3.4.3.orig/Source/cmLocalUnixMakefileGenerator3.cxx
|
|
+++ cmake-3.4.3/Source/cmLocalUnixMakefileGenerator3.cxx
|
|
@@ -2111,9 +2111,7 @@ void cmLocalUnixMakefileGenerator3::Writ
|
|
os
|
|
<< "# CMAKE generated file: DO NOT EDIT!\n"
|
|
<< "# Generated by \"" << this->GlobalGenerator->GetName() << "\""
|
|
- << " Generator, CMake Version "
|
|
- << cmVersion::GetMajorVersion() << "."
|
|
- << cmVersion::GetMinorVersion() << "\n\n";
|
|
+ << " Generator, CMake\n\n";
|
|
}
|
|
|
|
//----------------------------------------------------------------------------
|