kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-devel-version-macro' 

eaf703f1 Export: Use a macro to ensure minimum development version requirement
This commit is contained in:
Brad King 2014-02-10 11:25:08 -05:00 committed by CMake Topic Stage
parent c00d84cdf3 eaf703f160
commit d7133c0288
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmExportInstallFileGenerator.cxx
View File

@ -19,6 +19,18 @@
#include "cmInstallExportGenerator.h"
#include "cmInstallTargetGenerator.h"
#include "cmTargetExport.h"
#include "cmVersionConfig.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) ? \
STRINGIFY(CMake_VERSION_MAJOR) "." STRINGIFY(CMake_VERSION_MINOR) "." \
STRINGIFY(CMake_VERSION_PATCH) "." STRINGIFY(CMake_VERSION_TWEAK) \
: #maj "." #min "." #patch
//----------------------------------------------------------------------------
cmExportInstallFileGenerator
@ -176,7 +188,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
if (require3_0_0)
{
this->GenerateRequiredCMakeVersion(os, "2.8.12.20131007");
this->GenerateRequiredCMakeVersion(os, DEVEL_CMAKE_VERSION(3, 0, 0));
}
else if (require2_8_12)
{