diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-11 14:16:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-11 14:16:09 (GMT) |
| commit | 418a155be7e44117297c072b6aa0f21f4407c052 (patch) | |
| tree | 13971e018916a6b4f55edc688431eec080ef055e /Source/cmExportInstallFileGenerator.cxx | |
| parent | c29eb751cdaff74b3113f6199881f76b427a8391 (diff) | |
| parent | 9bcc1b21f05a8f522c5154e163942c6d133bb379 (diff) | |
| download | CMake-418a155be7e44117297c072b6aa0f21f4407c052.zip CMake-418a155be7e44117297c072b6aa0f21f4407c052.tar.gz CMake-418a155be7e44117297c072b6aa0f21f4407c052.tar.bz2 | |
Merge topic 'cmake-devel-version-macro'
9bcc1b21 Export: Fix internal CMake version test logic
d2059d25 cmVersion: Fix CMake_VERSION_ENCODE for date in patch level
28805109 cmStandardIncludes: Include cmIML/INT.h for portable integer types
Diffstat (limited to 'Source/cmExportInstallFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index eb7cea9..56c0ec1 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -19,15 +19,17 @@ #include "cmInstallExportGenerator.h" #include "cmInstallTargetGenerator.h" #include "cmTargetExport.h" -#include "cmVersionConfig.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) \ - (maj > CMake_VERSION_MAJOR \ - || min > CMake_VERSION_MINOR \ - || patch > CMake_VERSION_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 |