2016-02-20 15:49:22 +01:00
|
|
|
Enclosing the cmake version will cause a republish of generated files
|
|
|
|
|
2016-07-10 11:05:52 +02:00
|
|
|
--- cmake-3.6.0/Source/cmExportFileGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
|
|
|
|
+++ cmake-3.6.0_patched/Source/cmExportFileGenerator.cxx 2016-07-10 09:43:06.902186709 +0200
|
|
|
|
@@ -93,7 +93,7 @@
|
2016-02-20 15:49:22 +01:00
|
|
|
|
|
|
|
// Protect that file against use with older CMake versions.
|
2016-07-10 11:05:52 +02:00
|
|
|
/* clang-format off */
|
2016-02-20 15:49:22 +01:00
|
|
|
- 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";
|
2016-07-10 11:05:52 +02:00
|
|
|
diff -ru cmake-3.6.0/Source/cmExportLibraryDependenciesCommand.cxx cmake-3.6.0_patched/Source/cmExportLibraryDependenciesCommand.cxx
|
|
|
|
--- cmake-3.6.0/Source/cmExportLibraryDependenciesCommand.cxx 2016-07-07 16:47:27.000000000 +0200
|
|
|
|
+++ cmake-3.6.0_patched/Source/cmExportLibraryDependenciesCommand.cxx 2016-07-10 09:43:59.719118260 +0200
|
|
|
|
@@ -152,7 +152,7 @@
|
2016-02-20 15:49:22 +01:00
|
|
|
// versions.
|
|
|
|
const char* vertest =
|
|
|
|
"\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" GREATER 2.4";
|
2016-07-10 11:05:52 +02:00
|
|
|
- fout << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n";
|
2016-02-20 15:49:22 +01:00
|
|
|
+ fout << "# Generated by CMake\n\n";
|
|
|
|
fout << "if(" << vertest << ")\n";
|
|
|
|
fout << " # Information for CMake 2.6 and above.\n";
|
2016-07-10 11:05:52 +02:00
|
|
|
for (std::map<std::string, std::string>::const_iterator i =
|
|
|
|
diff -ru cmake-3.6.0/Source/cmGlobalGhsMultiGenerator.cxx cmake-3.6.0_patched/Source/cmGlobalGhsMultiGenerator.cxx
|
|
|
|
--- cmake-3.6.0/Source/cmGlobalGhsMultiGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
|
|
|
|
+++ cmake-3.6.0_patched/Source/cmGlobalGhsMultiGenerator.cxx 2016-07-10 09:40:07.711043443 +0200
|
|
|
|
@@ -333,8 +333,8 @@
|
2016-02-20 15:49:22 +01:00
|
|
|
(*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;
|
|
|
|
}
|
|
|
|
|
2016-07-10 11:05:52 +02:00
|
|
|
diff -ru cmake-3.6.0/Source/cmGlobalNinjaGenerator.cxx cmake-3.6.0_patched/Source/cmGlobalNinjaGenerator.cxx
|
|
|
|
--- cmake-3.6.0/Source/cmGlobalNinjaGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
|
|
|
|
+++ cmake-3.6.0_patched/Source/cmGlobalNinjaGenerator.cxx 2016-07-10 09:45:27.428670193 +0200
|
|
|
|
@@ -807,8 +807,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";
|
2016-02-20 15:49:22 +01:00
|
|
|
}
|
|
|
|
|
2016-03-09 07:13:12 +01:00
|
|
|
void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
|
2016-07-10 11:05:52 +02:00
|
|
|
diff -ru cmake-3.6.0/Source/cmLocalUnixMakefileGenerator3.cxx cmake-3.6.0_patched/Source/cmLocalUnixMakefileGenerator3.cxx
|
|
|
|
--- cmake-3.6.0/Source/cmLocalUnixMakefileGenerator3.cxx 2016-07-07 16:47:27.000000000 +0200
|
|
|
|
+++ cmake-3.6.0_patched/Source/cmLocalUnixMakefileGenerator3.cxx 2016-07-10 09:46:19.413592894 +0200
|
|
|
|
@@ -1878,8 +1878,7 @@
|
|
|
|
{
|
|
|
|
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";
|
2016-02-20 15:49:22 +01:00
|
|
|
}
|
|
|
|
|
2016-07-10 11:05:52 +02:00
|
|
|
std::string cmLocalUnixMakefileGenerator3::GetRecursiveMakeCall(
|
|
|
|
diff -ru cmake-3.6.0/Source/CPack/IFW/cmCPackIFWGenerator.cxx cmake-3.6.0_patched/Source/CPack/IFW/cmCPackIFWGenerator.cxx
|
|
|
|
--- cmake-3.6.0/Source/CPack/IFW/cmCPackIFWGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
|
|
|
|
+++ cmake-3.6.0_patched/Source/CPack/IFW/cmCPackIFWGenerator.cxx 2016-07-10 09:41:34.316559270 +0200
|
|
|
|
@@ -560,7 +560,7 @@
|
|
|
|
void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmXMLWriter& xout)
|
|
|
|
{
|
|
|
|
std::stringstream comment;
|
|
|
|
- comment << "Generated by CPack " << CMake_VERSION << " IFW generator "
|
|
|
|
+ comment << "Generated by CPack IFW generator "
|
|
|
|
<< "for QtIFW ";
|
|
|
|
if (IsVersionLess("2.0")) {
|
|
|
|
comment << "less 2.0";
|