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

Merge topic 'VERSION_no_sscanf'

Browse Source 
ef09df64 cmSystemTools: reimplement verson comparison without sscanf()
667560c8 extend the testing for version comparison
This commit is contained in:
Brad King 2014-10-31 11:35:06 -04:00 committed by CMake Topic Stage
commit f2805bd01b
2 changed files with 103 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/cmSystemTools.cxx
View File

@ -2634,29 +2634,37 @@ 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)
{ {
// Parse out up to 8 components. const char *endl = lhss;
unsigned int lhs[8] = {0,0,0,0,0,0,0,0}; const char *endr = rhss;
unsigned int rhs[8] = {0,0,0,0,0,0,0,0}; unsigned long lhs, rhs;
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. while (((*endl >= '0') && (*endl <= '9')) ||
for(unsigned int i=0; i < 8; ++i) ((*endr >= '0') && (*endr <= '9')))
{ {
if(lhs[i] < rhs[i]) // Do component-wise comparison.
lhs = strtoul(endl, const_cast<char**>(&endl), 10);
rhs = strtoul(endr, const_cast<char**>(&endr), 10);
if(lhs < rhs)
{ {
// lhs < rhs, so true if operation is LESS // lhs < rhs, so true if operation is LESS
return op == cmSystemTools::OP_LESS; return op == cmSystemTools::OP_LESS;
} }
else if(lhs[i] > rhs[i]) else if(lhs > rhs)
{ {
// lhs > rhs, so true if operation is GREATER // lhs > rhs, so true if operation is GREATER
return op == cmSystemTools::OP_GREATER; return op == cmSystemTools::OP_GREATER;
} }
if (*endr == '.')
{
endr++;
}
if (*endl == '.')
{
endl++;
}
} }
// lhs == rhs, so true if operation is EQUAL // lhs == rhs, so true if operation is EQUAL
return op == cmSystemTools::OP_EQUAL; return op == cmSystemTools::OP_EQUAL;

88
Tests/CMakeTests/VersionTest.cmake.in
View File

@ -8,9 +8,85 @@ else()
message("CMAKE_VERSION=[${CMAKE_VERSION}] is not less than [${min_ver}]") message("CMAKE_VERSION=[${CMAKE_VERSION}] is not less than [${min_ver}]")
endif() endif()
set(v 1.2.3.4.5.6.7) set(EQUALV "1 1")
if("${v}.8" VERSION_LESS "${v}.9") list(APPEND EQUALV "1.0 1")
message(STATUS "${v}.8 is less than ${v}.9") list(APPEND EQUALV "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1")
else() list(APPEND EQUALV "1.2.3.4.5.6.7 1.2.3.4.5.6.7")
message(FATAL_ERROR "${v}.8 is not less than ${v}.9?") list(APPEND EQUALV "1.2.3.4.5.6.7.8.9 1.2.3.4.5.6.7.8.9")
endif()
foreach(v IN LISTS EQUALV)
string(REGEX MATCH "(.*) (.*)" _dummy "${v}")
# modify any of the operands to see the negative check also works
if("${CMAKE_MATCH_1}.2" VERSION_EQUAL CMAKE_MATCH_2)
message(FATAL_ERROR "${CMAKE_MATCH_1}.2 is equal ${CMAKE_MATCH_2}?")
else()
message(STATUS "${CMAKE_MATCH_1}.2 is not equal ${CMAKE_MATCH_2}")
endif()
if(CMAKE_MATCH_1 VERSION_EQUAL "${CMAKE_MATCH_2}.2")
message(FATAL_ERROR "${CMAKE_MATCH_1} is equal ${CMAKE_MATCH_2}.2?")
else()
message(STATUS "${CMAKE_MATCH_1} is not equal ${CMAKE_MATCH_2}.2")
endif()
endforeach()
# test the negative outcomes first, due to the implementation the positive
# allow some additional strings to pass that would not fail for the negative
# tests
list(APPEND EQUALV "1a 1")
list(APPEND EQUALV "1.1a 1.1")
list(APPEND EQUALV "1.0a 1")
list(APPEND EQUALV "1a 1.0")
foreach(v IN LISTS EQUALV)
# check equal versions
string(REGEX MATCH "(.*) (.*)" _dummy "${v}")
if(CMAKE_MATCH_1 VERSION_EQUAL CMAKE_MATCH_2)
message(STATUS "${CMAKE_MATCH_1} is equal ${CMAKE_MATCH_2}")
else()
message(FATAL_ERROR "${CMAKE_MATCH_1} is not equal ${CMAKE_MATCH_2}?")
endif()
# still equal, but inverted order of operands
string(REGEX MATCH "(.*) (.*)" _dummy "${v}")
if(CMAKE_MATCH_2 VERSION_EQUAL CMAKE_MATCH_1)
message(STATUS "${CMAKE_MATCH_2} is equal ${CMAKE_MATCH_1}")
else()
message(FATAL_ERROR "${CMAKE_MATCH_2} is not equal ${CMAKE_MATCH_1}?")
endif()
endforeach()
set(LESSV "1.2.3.4.5.6.7.8 1.2.3.4.5.6.7.9")
list(APPEND LESSV "1.2.3.4.5.6.7 1.2.3.4.5.6.7.9")
list(APPEND LESSV "1 1.0.0.1")
foreach(v IN LISTS LESSV)
string(REGEX MATCH "(.*) (.*)" _dummy "${v}")
# check less
if(CMAKE_MATCH_1 VERSION_LESS CMAKE_MATCH_2)
message(STATUS "${CMAKE_MATCH_1} is less than ${CMAKE_MATCH_2}")
else()
message(FATAL_ERROR "${CMAKE_MATCH_1} is not less than ${CMAKE_MATCH_2}?")
endif()
# check greater
if(CMAKE_MATCH_2 VERSION_GREATER CMAKE_MATCH_1)
message(STATUS "${CMAKE_MATCH_2} is greater than ${CMAKE_MATCH_1}")
else()
message(FATAL_ERROR "${CMAKE_MATCH_2} is not greater than ${CMAKE_MATCH_1}?")
endif()
# check less negative case
if(NOT CMAKE_MATCH_2 VERSION_LESS CMAKE_MATCH_1)
message(STATUS "${CMAKE_MATCH_2} is not less than ${CMAKE_MATCH_1}")
else()
message(FATAL_ERROR "${CMAKE_MATCH_2} is less than ${CMAKE_MATCH_1}?")
endif()
# check greater negative case
if(NOT CMAKE_MATCH_1 VERSION_GREATER CMAKE_MATCH_2)
message(STATUS "${CMAKE_MATCH_1} is not greater than ${CMAKE_MATCH_2}")
else()
message(FATAL_ERROR "${CMAKE_MATCH_1} is greater than ${CMAKE_MATCH_2}?")
endif()
endforeach()