diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a2df2c..bc54a70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,17 +7,17 @@ set(QT_USE_QTNETWORK true) set(QT_USE_QTWEBKIT true) include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) -if(DEFINED FORVERT_APP_VERSION) - add_definitions(-DFV_APP_VERSION="${FORVERT_APP_VERSION") +if(DEFINED FERVOR_APP_VERSION) + add_definitions(-DFV_APP_VERSION="${FERVOR_APP_VERSION") else() add_definitions(-DFV_APP_VERSION="1.0") - message(WARNING "No version information for Forvert given (please set FORVERT_APP_VERSION)! Assuming 1.0.") + message(WARNING "No version information for Fervor given (please set FERVOR_APP_VERSION)! Assuming 1.0.") endif() -if(DEFINED FORVERT_APP_NAME) - add_definitions(-DFV_APP_NAME="${FORVERT_APP_NAME") +if(DEFINED FERVOR_APP_NAME) + add_definitions(-DFV_APP_NAME="${FERVOR_APP_NAME") else() add_definitions(-DFV_APP_NAME="App Name") - message(WARNING "No application name for Forvert given (please set FORVERT_APP_NAME)! Assuming 'App Name'.") + message(WARNING "No application name for Fervor given (please set FERVOR_APP_NAME)! Assuming 'App Name'.") endif() set(SOURCES diff --git a/tests/fvversioncomparatortest.cpp b/tests/fvversioncomparatortest.cpp index a627848..349dfd0 100644 --- a/tests/fvversioncomparatortest.cpp +++ b/tests/fvversioncomparatortest.cpp @@ -16,6 +16,7 @@ void FvVersionComparatorTest::testNumbers() QVERIFY(FvVersionComparator::CompareVersions("1.0.0", "0.0.1") == FvVersionComparator::kDescending); QVERIFY(FvVersionComparator::CompareVersions("1.0.0", "0.1.0") == FvVersionComparator::kDescending); QVERIFY(FvVersionComparator::CompareVersions("1.0.0", "0.9.9") == FvVersionComparator::kDescending); + QVERIFY(FvVersionComparator::CompareVersions("0.0.1", "0.0.2") == FvVersionComparator::kAscending); } void FvVersionComparatorTest::testPrereleases()