fix build

move matcher to qdlt lib

enable c++17 in qmake config

The new code uses variant and optional
added in c++17 standard while qmake config was
setup restricted to c++11

enable tests only if gtest package found

Set c++17 standard in cmake

export class for windows linker

BuildDltViewer.pro

@@ -2,7 +2,7 @@
 TEMPLATE = subdirs
 CONFIG   += ordered
 SUBDIRS  += qdlt src plugin commander
-CONFIG += c++11
+CONFIG += c++1z
 
 ICON = Project.icns
 QMAKE_INFO_PLIST = Info.plist

CMakeLists.txt

@@ -31,7 +31,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(LINUX TRUE)
 endif()
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -136,7 +136,6 @@ add_subdirectory(qdlt)
 add_subdirectory(src)
 add_subdirectory(plugin)
 add_subdirectory(commander)
-add_subdirectory(tools)
 
 message(STATUS "\n\t** DLT Viewer Build Summary **")
 message(STATUS "\tCMAKE_INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")

qdlt/CMakeLists.txt

@@ -39,7 +39,9 @@ add_library(qdlt SHARED
     qdltsettingsmanager.cpp
     qdltexporter.cpp
     qdltimporter.cpp
-    fieldnames.cpp)
+    fieldnames.cpp
+    dltmessagematcher.cpp
+    dltmessagematcher.h)
 
 target_compile_definitions(qdlt PRIVATE
     BYTE_ORDER=LITTLE_ENDIAN
@@ -116,3 +118,11 @@ foreach(SDK_EXAMPLE IN ITEMS ${SDK_EXAMPLES})
         DESTINATION "${DLT_ADDITIONAL_FILES_INSTALLATION_PATH}/src"
         COMPONENT qdlt_sdk)
 endforeach()
+
+
+find_package(GTest)
+# configure unit tests only if gtest found on the system
+if (GTest_FOUND)
+    enable_testing()
+    add_subdirectory(tests)
+endif()

tools/dltmessagematcher.h → qdlt/dltmessagematcher.h

@@ -1,12 +1,17 @@
 #ifndef DLTMESSAGEMATCHER_H
 #define DLTMESSAGEMATCHER_H
 
+#include "export_rules.h"
+
 #include <QString>
 #include <QRegularExpression>
 
+#include <optional>
+#include <variant>
+
 class QDltMsg;
 
-class DltMessageMatcher
+class QDLT_EXPORT DltMessageMatcher
 {
 public:
     using Pattern = std::variant<QString, QRegularExpression>;

qdlt/qdlt.pro

@@ -2,7 +2,7 @@
 PROJECT                 = qdlt
 TEMPLATE                = lib
 
-CONFIG += c++11
+CONFIG += c++1z
 DEFINES += QDLT_LIBRARY
 *-gcc* {
     QMAKE_CFLAGS += -std=gnu99
@@ -11,7 +11,7 @@ DEFINES += QDLT_LIBRARY
 }
 
 *-g++* {
-    QMAKE_CXXFLAGS += -std=gnu++0x
+    QMAKE_CXXFLAGS += -std=c++17
     QMAKE_CXXFLAGS += -Wall
     QMAKE_CXXFLAGS += -Wextra
     QMAKE_CXXFLAGS += -DPLUGIN_INSTALLATION_PATH=\\\"$$PREFIX/usr/share/dlt-viewer/plugins\\\"
@@ -65,6 +65,7 @@ SOURCES +=  \
     qdltexporter.cpp \
     fieldnames.cpp \
     qdltimporter.cpp \
+    dltmessagematcher.cpp \
 
 HEADERS += qdlt.h \
     export_rules.h \
@@ -96,6 +97,7 @@ HEADERS += qdlt.h \
     qdltexporter.h \
     fieldnames.h \
     qdltimporter.h \
+    dltmessagematcher.h \
 
 unix:VERSION            = 1.0.0
 

tools/tests/CMakeLists.txt → qdlt/tests/CMakeLists.txt

@@ -1,14 +1,10 @@
-find_package(GTest REQUIRED)
-
-enable_testing()
-
 add_executable(test_tools
     test_dltmessagematcher.cpp
 )
 target_link_libraries(
   test_tools
   PRIVATE
     GTest::gtest_main
-    tools
+    qdlt
 )
 

src/CMakeLists.txt

@@ -53,7 +53,6 @@ add_executable(dlt-viewer
 
 target_link_libraries(dlt-viewer
     qdlt
-    tools
     ${QT_PREFIX}::Core
     ${QT_PREFIX}::Network
     ${QT_PREFIX}::Widgets

src/src.pro

@@ -4,6 +4,7 @@ QT_VERSION = $$split(QT_VERSION, ".")
 QT_VER_MAJ = $$member(QT_VERSION, 0)
 QT_VER_MIN = $$member(QT_VERSION, 1)
 
+CONFIG += c++1z
 *-gcc* {
     QMAKE_CFLAGS += -std=gnu99
     QMAKE_CFLAGS += -Wall
@@ -12,7 +13,7 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
 }
 
 *-g++* {
-    QMAKE_CXXFLAGS += -std=gnu++0x
+    QMAKE_CXXFLAGS += -std=c++17
     QMAKE_CXXFLAGS += -Wall
     QMAKE_CXXFLAGS += -Wextra
     #QMAKE_CXXFLAGS += -pedantic