[Cmake-commits] CMake branch, next, updated. v3.6.0-771-gcfdb159

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  cfdb1592487c71e046d4f08d63d828d54b712e94 (commit)
       via  c376c5bca204a689b5bcfec88291b8bc7f226e7f (commit)
      from  18e430bee9d9f446d6aa07707001931fbe879742 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfdb1592487c71e046d4f08d63d828d54b712e94
commit cfdb1592487c71e046d4f08d63d828d54b712e94
Merge: 18e430b c376c5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 11:45:54 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 11 11:45:54 2016 -0400

    Merge topic 'no-export-cmake-version' into next
    
    c376c5bc Do not place CMake version in export files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c376c5bca204a689b5bcfec88291b8bc7f226e7f
commit c376c5bca204a689b5bcfec88291b8bc7f226e7f
Author:     Christoph Grüninger <foss at grueninger.de>
AuthorDate: Sun Jul 10 15:35:24 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 11 11:35:27 2016 -0400

    Do not place CMake version in export files
    
    Files generated by `install(EXPORT)` and `export_library_dependencies()`
    may be installed with packages and consumed by dependents.  In order to
    avoid re-building dependents only because the version of CMake changed,
    drop the CMake version from the export file content.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d93e406..e00af5e 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -93,7 +93,7 @@ bool cmExportFileGenerator::GenerateImportFile()
 
   // Protect that file against use with older CMake versions.
   /* clang-format off */
-  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";
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index c8272cb..b422a2c 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -152,7 +152,7 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
   // 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 i =

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportFileGenerator.cxx              |    2 +-
 Source/cmExportLibraryDependenciesCommand.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake