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 0fc09f7974f8a61cd2906650b1732e58acc6daa4 (commit) via 2197bcdeeaecd158778318d30f1d8bbb2db2b34f (commit) via 6ca6613ab8a30da726118b31e1c6fb11c54e6cdd (commit) from 9e98a8d095adf12b79bcbef2bad31ded136cf5c7 (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fc09f7974f8a61cd2906650b1732e58acc6daa4 commit 0fc09f7974f8a61cd2906650b1732e58acc6daa4 Merge: 9e98a8d 2197bcd Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Feb 11 10:38:20 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Feb 11 10:38:20 2014 -0500 Merge topic 'cmake-devel-version-macro' into next 2197bcde Export: Issue runtime error if DEVEL_CMAKE_VERSION requests old version. 6ca6613a Export: Use the CMAKE_DEVEL_VERSION macro for build-export files. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2197bcdeeaecd158778318d30f1d8bbb2db2b34f commit 2197bcdeeaecd158778318d30f1d8bbb2db2b34f Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Feb 11 16:21:29 2014 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Tue Feb 11 16:33:06 2014 +0100 Export: Issue runtime error if DEVEL_CMAKE_VERSION requests old version. While developing version 3.1.0, this macro is used with DEVEL_CMAKE_VERSION(3, 1, 0) and it expands to a datestamped version such as "3.0.x.2014yyyy". When the version of cmake is bumped to 3.1.0, the macro expands to "3.1.0". The macro should be replaced with the static string "3.1.0" soon after the 3.1.0 release. Create a runtime error if the version of cmake is bumped to an encoded version greater than 3.1.0 without first replacing the macro with a static string. It is not possible/practical to create a compile-time error in this case, depending on the values of the macro parameters. diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 4a161ee..c42e6d1 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -179,6 +179,7 @@ void cmExportFileGenerator::PopulateInterfaceProperty(const char *propName, void cmExportFileGenerator::GenerateRequiredCMakeVersion(std::ostream& os, const char *versionString) { + assert(versionString); os << "if(CMAKE_VERSION VERSION_LESS " << versionString << ")\n" " message(FATAL_ERROR \"This file relies on consumers using " "CMake " << versionString << " or greater.\")\n" diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h index 8be4bbf..a0dd540 100644 --- a/Source/cmExportFileGenerator.h +++ b/Source/cmExportFileGenerator.h @@ -22,6 +22,10 @@ #define STRINGIFY(X) STRINGIFY_HELPER(X) #define DEVEL_CMAKE_VERSION(maj, min, patch) \ + (CMake_VERSION_ENCODE(maj, min, patch) < \ + CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \ + CMake_VERSION_PATCH) \ + ) ? 0 : \ (CMake_VERSION_ENCODE(maj, min, patch) > \ CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \ CMake_VERSION_PATCH) \ http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ca6613ab8a30da726118b31e1c6fb11c54e6cdd commit 6ca6613ab8a30da726118b31e1c6fb11c54e6cdd Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Feb 11 16:31:53 2014 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Tue Feb 11 16:31:53 2014 +0100 Export: Use the CMAKE_DEVEL_VERSION macro for build-export files. Move the macro definition to the cmExportBuildFileGenerator.h header to share it. diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 858f76c..a77bc68 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -52,7 +52,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os) } if (te->GetType() == cmTarget::INTERFACE_LIBRARY) { - this->GenerateRequiredCMakeVersion(os, "2.8.12.20131007"); // 2.8.13 + this->GenerateRequiredCMakeVersion(os, DEVEL_CMAKE_VERSION(3, 0, 0)); } } diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h index 1438f4d..8be4bbf 100644 --- a/Source/cmExportFileGenerator.h +++ b/Source/cmExportFileGenerator.h @@ -15,6 +15,21 @@ #include "cmCommand.h" #include "cmGeneratorExpression.h" +#include "cmVersionMacros.h" +#include "cmVersion.h" + +#define STRINGIFY_HELPER(X) #X +#define STRINGIFY(X) STRINGIFY_HELPER(X) + +#define DEVEL_CMAKE_VERSION(maj, min, patch) \ + (CMake_VERSION_ENCODE(maj, min, patch) > \ + CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \ + CMake_VERSION_PATCH) \ + ) ? \ + STRINGIFY(CMake_VERSION_MAJOR) "." STRINGIFY(CMake_VERSION_MINOR) "." \ + STRINGIFY(CMake_VERSION_PATCH) "." STRINGIFY(CMake_VERSION_TWEAK) \ + : #maj "." #min "." #patch + class cmTargetExport; /** \class cmExportFileGenerator diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 56c0ec1..8b59665 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -19,20 +19,6 @@ #include "cmInstallExportGenerator.h" #include "cmInstallTargetGenerator.h" #include "cmTargetExport.h" -#include "cmVersionMacros.h" -#include "cmVersion.h" - -#define STRINGIFY_HELPER(X) #X -#define STRINGIFY(X) STRINGIFY_HELPER(X) - -#define DEVEL_CMAKE_VERSION(maj, min, patch) \ - (CMake_VERSION_ENCODE(maj, min, patch) > \ - CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \ - CMake_VERSION_PATCH) \ - ) ? \ - STRINGIFY(CMake_VERSION_MAJOR) "." STRINGIFY(CMake_VERSION_MINOR) "." \ - STRINGIFY(CMake_VERSION_PATCH) "." STRINGIFY(CMake_VERSION_TWEAK) \ - : #maj "." #min "." #patch //---------------------------------------------------------------------------- cmExportInstallFileGenerator ----------------------------------------------------------------------- Summary of changes: Source/cmExportBuildFileGenerator.cxx | 2 +- Source/cmExportFileGenerator.cxx | 1 + Source/cmExportFileGenerator.h | 19 +++++++++++++++++++ Source/cmExportInstallFileGenerator.cxx | 14 -------------- 4 files changed, 21 insertions(+), 15 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits