Index: denali.pro =================================================================== diff -u -rf623529d6ec25b555f3ac2248d71fc2b5e7063d6 -r188d7611230946fc5fde4e3e837a09202dd93eea --- denali.pro (.../denali.pro) (revision f623529d6ec25b555f3ac2248d71fc2b5e7063d6) +++ denali.pro (.../denali.pro) (revision 188d7611230946fc5fde4e3e837a09202dd93eea) @@ -1,6 +1,19 @@ QT += widgets qml quick serialbus CONFIG += c++17 warn_on +QMAKE_CXXFLAGS += -Wall -Werror +#CONFIG += disable_crc +disable_crc { + message( *** IMPORTANT : DISABLED CRC CHECK *** ) + DEFINES += DISABLE_CRC +} + +#CONFIG += disable_keepalive +disable_keepalive { + message( *** IMPORTANT : DISABLED KEEP ALIVE *** ) + DEFINES += DISABLE_KEEP_ALIVE +} + # The following define makes your compiler emit warnings if you use # any Qt feature that has been marked deprecated (the exact warnings # depend on your compiler). Refer to the documentation for the @@ -16,41 +29,53 @@ sources \ sources/storage \ sources/gui \ - sources/canbus + sources/canbus \ + sources/utility HEADERS += \ sources/applicationcontroller.h \ sources/applicationpost.h \ sources/canbus/caninterface.h \ - sources/canbus/messagehandler.h \ + sources/canbus/frameinterface.h \ + sources/canbus/messagebuilder.h \ + sources/canbus/messagedispatcher.h \ + sources/canbus/messageglobals.h \ + sources/canbus/messageinterpreter.h \ sources/configuration/display.h \ sources/configuration/sound.h \ - sources/gui/guiactions.h \ sources/gui/guiglobals.h \ sources/gui/guiview.h \ sources/gui/guicontroller.h \ sources/main.h \ sources/maintimer.h \ sources/storage/filehandler.h \ sources/storage/logger.h \ - sources/storage/settings.h + sources/storage/settings.h \ + sources/utility/crc.h \ + sources/utility/format.h \ + sources/utility/types.h SOURCES += \ - main.cpp \ - sources/applicationcontroller.cpp \ - sources/applicationpost.cpp \ - sources/canbus/caninterface.cpp \ - sources/canbus/messagehandler.cpp \ - sources/configuration/display.cpp \ - sources/configuration/sound.cpp \ - sources/gui/guiactions.cpp \ - sources/gui/guiglobals.cpp \ - sources/gui/guiview.cpp \ - sources/gui/guicontroller.cpp \ - sources/maintimer.cpp \ - sources/storage/filehandler.cpp \ - sources/storage/logger.cpp \ - sources/storage/settings.cpp + main.cpp \ + sources/applicationcontroller.cpp \ + sources/applicationpost.cpp \ + sources/canbus/caninterface.cpp \ + sources/canbus/frameinterface.cpp \ + sources/canbus/messagebuilder.cpp \ + sources/canbus/messagedispatcher.cpp \ + sources/canbus/messageinterpreter.cpp \ + sources/configuration/display.cpp \ + sources/configuration/sound.cpp \ + sources/gui/guiglobals.cpp \ + sources/gui/guiview.cpp \ + sources/gui/guicontroller.cpp \ + sources/maintimer.cpp \ + sources/storage/filehandler.cpp \ + sources/storage/logger.cpp \ + sources/storage/settings.cpp \ + sources/utility/crc.cpp \ + sources/utility/format.cpp \ + sources/utility/types.cpp RESOURCES += \ denali.qrc @@ -68,22 +93,24 @@ COVERAGE_OPTIONS += --cs-exclude-file-regex=ui_.* COVERAGE_OPTIONS += --cs-exclude-file-regex=moc_.* COVERAGE_OPTIONS += --cs-exclude-file-regex=main.cpp - COVERAGE_OPTIONS += --cs-exclude-file-regex=unittests.* COVERAGE_OPTIONS += --cs-exclude-file-regex=qmlcache* + COVERAGE_OPTIONS += --cs-exclude-file-regex=tst_* QMAKE_CFLAGS += $$COVERAGE_OPTIONS QMAKE_CXXFLAGS += $$COVERAGE_OPTIONS QMAKE_LFLAGS += $$COVERAGE_OPTIONS } -testcase { - message(Building with QtTest) +tst_canbus { + message(Building with QtTest test case canbus) QT += testlib - DEFINES += UNIT_TEST + DEFINES += UNIT_TEST \ + TEST_CLASS_INCLUDE=\\\"unittests/tst_canbus.h\\\" \ + TEST_CLASS_NAME=tst_canbus HEADERS += \ - unittests/unittests.h - SOURCES += \ - unittests/unittests.cpp + unittests/tst_canbus.h + SOURCES += \ + unittests/tst_canbus.cpp } # Additional import path used to resolve QML modules in Qt Creator's code model