Merge topic 'version-compare-genex'
e605528
Add generator expressions for version comparision.48bb48e
De-duplicate version comparison code.
This commit is contained in:
commit
c1631efa0e
|
@ -48,6 +48,12 @@
|
||||||
"used.\n" \
|
"used.\n" \
|
||||||
" $<CXX_COMPILER_ID:comp> = '1' if the CMake-id of the CXX " \
|
" $<CXX_COMPILER_ID:comp> = '1' if the CMake-id of the CXX " \
|
||||||
"compiler matches comp, otherwise '0'.\n" \
|
"compiler matches comp, otherwise '0'.\n" \
|
||||||
|
" $<VERSION_GREATER:v1,v2> = '1' if v1 is a version greater than " \
|
||||||
|
"v2, else '0'.\n" \
|
||||||
|
" $<VERSION_LESS:v1,v2> = '1' if v1 is a version less than v2, " \
|
||||||
|
"else '0'.\n" \
|
||||||
|
" $<VERSION_EQUAL:v1,v2> = '1' if v1 is the same version as v2, " \
|
||||||
|
"else '0'.\n" \
|
||||||
" $<TARGET_FILE:tgt> = main file (.exe, .so.1.2, .a)\n" \
|
" $<TARGET_FILE:tgt> = main file (.exe, .so.1.2, .a)\n" \
|
||||||
" $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)\n" \
|
" $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)\n" \
|
||||||
" $<TARGET_SONAME_FILE:tgt> = file with soname (.so.3)\n" \
|
" $<TARGET_SONAME_FILE:tgt> = file with soname (.so.3)\n" \
|
||||||
|
|
|
@ -341,6 +341,60 @@ static const struct CXXCompilerIdNode : public CompilerIdNode
|
||||||
}
|
}
|
||||||
} cxxCompilerIdNode;
|
} cxxCompilerIdNode;
|
||||||
|
|
||||||
|
//----------------------------------------------------------------------------
|
||||||
|
static const struct VersionGreaterNode : public cmGeneratorExpressionNode
|
||||||
|
{
|
||||||
|
VersionGreaterNode() {}
|
||||||
|
|
||||||
|
virtual int NumExpectedParameters() const { return 2; }
|
||||||
|
|
||||||
|
std::string Evaluate(const std::vector<std::string> ¶meters,
|
||||||
|
cmGeneratorExpressionContext *,
|
||||||
|
const GeneratorExpressionContent *,
|
||||||
|
cmGeneratorExpressionDAGChecker *) const
|
||||||
|
{
|
||||||
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER,
|
||||||
|
parameters.front().c_str(),
|
||||||
|
parameters[1].c_str()) ? "1" : "0";
|
||||||
|
}
|
||||||
|
} versionGreaterNode;
|
||||||
|
|
||||||
|
//----------------------------------------------------------------------------
|
||||||
|
static const struct VersionLessNode : public cmGeneratorExpressionNode
|
||||||
|
{
|
||||||
|
VersionLessNode() {}
|
||||||
|
|
||||||
|
virtual int NumExpectedParameters() const { return 2; }
|
||||||
|
|
||||||
|
std::string Evaluate(const std::vector<std::string> ¶meters,
|
||||||
|
cmGeneratorExpressionContext *,
|
||||||
|
const GeneratorExpressionContent *,
|
||||||
|
cmGeneratorExpressionDAGChecker *) const
|
||||||
|
{
|
||||||
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS,
|
||||||
|
parameters.front().c_str(),
|
||||||
|
parameters[1].c_str()) ? "1" : "0";
|
||||||
|
}
|
||||||
|
} versionLessNode;
|
||||||
|
|
||||||
|
//----------------------------------------------------------------------------
|
||||||
|
static const struct VersionEqualNode : public cmGeneratorExpressionNode
|
||||||
|
{
|
||||||
|
VersionEqualNode() {}
|
||||||
|
|
||||||
|
virtual int NumExpectedParameters() const { return 2; }
|
||||||
|
|
||||||
|
std::string Evaluate(const std::vector<std::string> ¶meters,
|
||||||
|
cmGeneratorExpressionContext *,
|
||||||
|
const GeneratorExpressionContent *,
|
||||||
|
cmGeneratorExpressionDAGChecker *) const
|
||||||
|
{
|
||||||
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_EQUAL,
|
||||||
|
parameters.front().c_str(),
|
||||||
|
parameters[1].c_str()) ? "1" : "0";
|
||||||
|
}
|
||||||
|
} versionEqualNode;
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
static const struct ConfigurationNode : public cmGeneratorExpressionNode
|
static const struct ConfigurationNode : public cmGeneratorExpressionNode
|
||||||
{
|
{
|
||||||
|
@ -1172,6 +1226,12 @@ cmGeneratorExpressionNode* GetNode(const std::string &identifier)
|
||||||
return &cCompilerIdNode;
|
return &cCompilerIdNode;
|
||||||
else if (identifier == "CXX_COMPILER_ID")
|
else if (identifier == "CXX_COMPILER_ID")
|
||||||
return &cxxCompilerIdNode;
|
return &cxxCompilerIdNode;
|
||||||
|
else if (identifier == "VERSION_GREATER")
|
||||||
|
return &versionGreaterNode;
|
||||||
|
else if (identifier == "VERSION_LESS")
|
||||||
|
return &versionLessNode;
|
||||||
|
else if (identifier == "VERSION_EQUAL")
|
||||||
|
return &versionEqualNode;
|
||||||
else if (identifier == "CONFIGURATION")
|
else if (identifier == "CONFIGURATION")
|
||||||
return &configurationNode;
|
return &configurationNode;
|
||||||
else if (identifier == "CONFIG")
|
else if (identifier == "CONFIG")
|
||||||
|
|
|
@ -405,38 +405,6 @@ namespace
|
||||||
reducible = 1;
|
reducible = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=========================================================================
|
|
||||||
enum Op { OpLess, OpEqual, OpGreater };
|
|
||||||
bool HandleVersionCompare(Op op, const char* lhs_str, const char* rhs_str)
|
|
||||||
{
|
|
||||||
// Parse out up to 8 components.
|
|
||||||
unsigned int lhs[8] = {0,0,0,0,0,0,0,0};
|
|
||||||
unsigned int rhs[8] = {0,0,0,0,0,0,0,0};
|
|
||||||
sscanf(lhs_str, "%u.%u.%u.%u.%u.%u.%u.%u",
|
|
||||||
&lhs[0], &lhs[1], &lhs[2], &lhs[3],
|
|
||||||
&lhs[4], &lhs[5], &lhs[6], &lhs[7]);
|
|
||||||
sscanf(rhs_str, "%u.%u.%u.%u.%u.%u.%u.%u",
|
|
||||||
&rhs[0], &rhs[1], &rhs[2], &rhs[3],
|
|
||||||
&rhs[4], &rhs[5], &rhs[6], &rhs[7]);
|
|
||||||
|
|
||||||
// Do component-wise comparison.
|
|
||||||
for(unsigned int i=0; i < 8; ++i)
|
|
||||||
{
|
|
||||||
if(lhs[i] < rhs[i])
|
|
||||||
{
|
|
||||||
// lhs < rhs, so true if operation is LESS
|
|
||||||
return op == OpLess;
|
|
||||||
}
|
|
||||||
else if(lhs[i] > rhs[i])
|
|
||||||
{
|
|
||||||
// lhs > rhs, so true if operation is GREATER
|
|
||||||
return op == OpGreater;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// lhs == rhs, so true if operation is EQUAL
|
|
||||||
return op == OpEqual;
|
|
||||||
}
|
|
||||||
|
|
||||||
//=========================================================================
|
//=========================================================================
|
||||||
// level 0 processes parenthetical expressions
|
// level 0 processes parenthetical expressions
|
||||||
bool HandleLevel0(std::list<std::string> &newArgs,
|
bool HandleLevel0(std::list<std::string> &newArgs,
|
||||||
|
@ -723,16 +691,16 @@ namespace
|
||||||
{
|
{
|
||||||
def = cmIfCommand::GetVariableOrString(arg->c_str(), makefile);
|
def = cmIfCommand::GetVariableOrString(arg->c_str(), makefile);
|
||||||
def2 = cmIfCommand::GetVariableOrString((argP2)->c_str(), makefile);
|
def2 = cmIfCommand::GetVariableOrString((argP2)->c_str(), makefile);
|
||||||
Op op = OpEqual;
|
cmSystemTools::CompareOp op = cmSystemTools::OP_EQUAL;
|
||||||
if(*argP1 == "VERSION_LESS")
|
if(*argP1 == "VERSION_LESS")
|
||||||
{
|
{
|
||||||
op = OpLess;
|
op = cmSystemTools::OP_LESS;
|
||||||
}
|
}
|
||||||
else if(*argP1 == "VERSION_GREATER")
|
else if(*argP1 == "VERSION_GREATER")
|
||||||
{
|
{
|
||||||
op = OpGreater;
|
op = cmSystemTools::OP_GREATER;
|
||||||
}
|
}
|
||||||
bool result = HandleVersionCompare(op, def, def2);
|
bool result = cmSystemTools::VersionCompare(op, def, def2);
|
||||||
HandleBinaryOp(result,
|
HandleBinaryOp(result,
|
||||||
reducible, arg, newArgs, argP1, argP2);
|
reducible, arg, newArgs, argP1, argP2);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2683,13 +2683,18 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
|
||||||
bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op,
|
bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op,
|
||||||
const char* lhss, const char* rhss)
|
const char* lhss, const char* rhss)
|
||||||
{
|
{
|
||||||
unsigned int lhs[4] = {0,0,0,0};
|
// Parse out up to 8 components.
|
||||||
unsigned int rhs[4] = {0,0,0,0};
|
unsigned int lhs[8] = {0,0,0,0,0,0,0,0};
|
||||||
sscanf(lhss, "%u.%u.%u.%u", &lhs[0], &lhs[1], &lhs[2], &lhs[3]);
|
unsigned int rhs[8] = {0,0,0,0,0,0,0,0};
|
||||||
sscanf(rhss, "%u.%u.%u.%u", &rhs[0], &rhs[1], &rhs[2], &rhs[3]);
|
sscanf(lhss, "%u.%u.%u.%u.%u.%u.%u.%u",
|
||||||
|
&lhs[0], &lhs[1], &lhs[2], &lhs[3],
|
||||||
|
&lhs[4], &lhs[5], &lhs[6], &lhs[7]);
|
||||||
|
sscanf(rhss, "%u.%u.%u.%u.%u.%u.%u.%u",
|
||||||
|
&rhs[0], &rhs[1], &rhs[2], &rhs[3],
|
||||||
|
&rhs[4], &rhs[5], &rhs[6], &rhs[7]);
|
||||||
|
|
||||||
// Do component-wise comparison.
|
// Do component-wise comparison.
|
||||||
for(unsigned int i=0; i < 4; ++i)
|
for(unsigned int i=0; i < 8; ++i)
|
||||||
{
|
{
|
||||||
if(lhs[i] < rhs[i])
|
if(lhs[i] < rhs[i])
|
||||||
{
|
{
|
||||||
|
|
|
@ -130,6 +130,12 @@ add_custom_target(check-part2 ALL
|
||||||
-Dtest_arbitrary_content_comma_8=$<1:a,,b>
|
-Dtest_arbitrary_content_comma_8=$<1:a,,b>
|
||||||
-Dtest_arbitrary_content_comma_9=$<1:a,,b,,>
|
-Dtest_arbitrary_content_comma_9=$<1:a,,b,,>
|
||||||
-Dtest_arbitrary_content_comma_10=$<1:,,a,,b,,>
|
-Dtest_arbitrary_content_comma_10=$<1:,,a,,b,,>
|
||||||
|
-Dtest_version_greater_1=$<VERSION_GREATER:1.0,1.1.1>
|
||||||
|
-Dtest_version_greater_2=$<VERSION_GREATER:1.1.1,1.0>
|
||||||
|
-Dtest_version_less_1=$<VERSION_LESS:1.1.1,1.0>
|
||||||
|
-Dtest_version_less_2=$<VERSION_LESS:1.0,1.1.1>
|
||||||
|
-Dtest_version_equal_1=$<VERSION_EQUAL:1.0.1,1.1>
|
||||||
|
-Dtest_version_equal_2=$<VERSION_EQUAL:1.1,1.1>
|
||||||
-P ${CMAKE_CURRENT_SOURCE_DIR}/check-part2.cmake
|
-P ${CMAKE_CURRENT_SOURCE_DIR}/check-part2.cmake
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "check done (part 2 of 2)"
|
COMMAND ${CMAKE_COMMAND} -E echo "check done (part 2 of 2)"
|
||||||
VERBATIM
|
VERBATIM
|
||||||
|
|
|
@ -44,3 +44,9 @@ check(test_arbitrary_content_comma_7 ",,a")
|
||||||
check(test_arbitrary_content_comma_8 "a,,b")
|
check(test_arbitrary_content_comma_8 "a,,b")
|
||||||
check(test_arbitrary_content_comma_9 "a,,b,,")
|
check(test_arbitrary_content_comma_9 "a,,b,,")
|
||||||
check(test_arbitrary_content_comma_10 ",,a,,b,,")
|
check(test_arbitrary_content_comma_10 ",,a,,b,,")
|
||||||
|
check(test_version_greater_1 "0")
|
||||||
|
check(test_version_greater_2 "1")
|
||||||
|
check(test_version_less_1 "0")
|
||||||
|
check(test_version_less_2 "1")
|
||||||
|
check(test_version_equal_1 "0")
|
||||||
|
check(test_version_equal_2 "1")
|
||||||
|
|
Loading…
Reference in New Issue