From 5a0db92f4eefc91ecc7177ace4a37521fac3fe88 Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Fri, 15 Mar 2024 16:59:31 +0100 Subject: [PATCH] Fixed windows compile --- CMakeLists.txt | 1039 +++++++++++++++++++++++------------------------- 1 file changed, 504 insertions(+), 535 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c86250a..ce4c2d69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,13 +25,16 @@ # VSCP_PATH - set to path to local vscp repository. Default is "../vscp". Set with # -DVSCP_PATH="path" # +# windows +# ------- +# cmake .. -G "Visual Studio 17 2022" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE=G:\vcpkg\scripts\buildsystems\vcpkg.cmake -DCMAKE_PREFIX_PATH=G:\Qt\5.15.2\msvc2019_64\ +# cmake --build . --config Debug +# set PATH=G:\Qt\Qt-6.6.2\msvc2019_64\bin;%PATH% +# cmake_minimum_required(VERSION 3.5) project(vscp-works-qt LANGUAGES CXX C) -add_subdirectory(./third_party/spdlog/) -#add_subdirectory(./third_party/libwebsockets/) - option(USE_SSL "Use SSL" TRUE) ## --- C++14 build flags --- @@ -153,16 +156,11 @@ ELSE(CURL_FOUND) MESSAGE(FATAL_ERROR "Could not find the CURL library.") ENDIF(CURL_FOUND) -# Set civetweb build flags -#add_definitions(-DUSE_WEBSOCKET) -#add_definitions(-DUSE_IPV6) -#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_IPV6 -DUSE_WEBSOCKET ") - set(OPENSSL_VER "OPENSSL_API_${OPENSSL_VERSION_MAJOR}_${OPENSSL_VERSION_MINOR}") message(STATUS "OPENSSL Version: ${OPENSSL_VER} - ${OPENSSL_VERSION}") #add_definitions(-D${OPENSSL_VER}) -# 1.1.0 / 1.1.1 / 3.0.0 / 3.1.0 +# 1.1.0 / 1.1.1 / 3.0.0 / 3.1.0 / 3.2.0 string(FIND "${OPENSSL_VERSION}" "1.0" SSL_VER_POS) if(NOT ${SSL_VER_POS} EQUAL -1) add_definitions(-DOPENSSL_API_1_0) @@ -187,540 +185,514 @@ if(NOT SSL_VER_POS EQUAL -1) message(STATUS "Open ssl version is 3.1") endif() +string(FIND "${OPENSSL_VERSION}" "3.2" SSL_VER_POS) +if(NOT SSL_VER_POS EQUAL -1) + add_definitions(-DOPENSSL_API_3_2) + message(STATUS "Open ssl version is 3.2") +endif() + # set(UI ) qt5_wrap_ui(UI src/mainwindow.ui - src/cdlgmainsettings.ui - src/cdlgconnsettingslocal.ui - src/cdlgconnsettingscanal.ui - src/cdlgconnsettingstcpip.ui - src/cdlgconnsettingssocketcan.ui - src/cdlgconnsettingsmqtt.ui - src/cdlgconnsettingsws1.ui - src/cdlgconnsettingsws2.ui - src/cdlgconnsettingsudp.ui - src/cdlgconnsettingsmulticast.ui - src/cdlgconnsettingsrest.ui - src/cdlgconnsettingsrawcan.ui - src/cdlgconnsettingsrawmqtt.ui - src/cdlgnewconnection.ui - src/cdlglevel1filter.ui - src/cdlglevel1filterwizard.ui - src/cdlglevel2filter.ui - src/cdlgsocketcanflags.ui - src/cdlgmqttpublish.ui - src/cdlgmqttsubscribe.ui - src/cdlgknownguid.ui - src/cdlgeditguid.ui - src/cdlgcanfilter.ui - src/cdlgtls.ui - src/cdlglog.ui - src/cdlgsensorindex.ui - src/cdlgeditsensorindex.ui - src/cdlgtxedit.ui - src/cdlgsessionfilter.ui - src/cdlgeditsessionfilter.ui - src/cdlgselectclass.ui - src/cdlgselectguid.ui - src/cdlgselectobid.ui - src/cdlgselectdata.ui - src/cdlgselectdatasize.ui - src/cdlgselectmeasurementvalue.ui - src/cdlgselectpriority.ui - src/cdlgselectmeasurementvalue.ui - src/cdlgselecttimestamp.ui - src/cdlgselectunit.ui - src/cdlgselectsensorindex.ui - src/cdlgselectdatacoding.ui - src/cdlgselectdate.ui - src/cdlgselectconstraint.ui - src/cfrmnodeconfig.ui - src/cfrmnodescan.ui - src/cdlgactionparam.ui - src/cdlgdatepicker.ui - src/cfrmmdf.ui - src/cdlgmdfmodule.ui - src/cdlgmdffilepicture.ui - src/cdlgmdfmodule.ui - src/cdlgmdfevent.ui - src/cdlgmdffilesetup.ui - src/cdlgmdfregister.ui - src/cdlgmdfbootloader.ui - src/cdlgmdffiledriver.ui - src/cdlgmdffile.ui - src/cdlgmdfremotevar.ui - src/cdlgmdfdescription.ui - src/cdlgmdfinfourl.ui - src/cdlgmdffilefirmware.ui - src/cdlgmdffilevideo.ui - src/cdlgmdffilemanual.ui - src/cdlgmdfvaluelist.ui - src/cdlgeditmap.ui - src/cdlgmdfmanufacturer.ui - src/cdlgmdfcontact.ui - src/cdlgmdfcontactlist.ui - - src/cdlgmdfregister.ui - src/cdlgmdfregisterlist.ui - - src/cdlgmdfbit.ui - src/cdlgmdfbitlist.ui - src/cdlgmdfvalue.ui - src/cdlgmdfvaluelist.ui - - src/cdlgmdfregistermapping.ui - - src/cdlgmdfremotevar.ui - src/cdlgmdfremotevarlist.ui - # src/cdlgmdfremotevarbitlist.ui - # src/cdlgmdfremotevarbit.ui - # src/cdlgmdfremotevarvaluelist.ui - # src/cdlgmdfremotevarvalue.ui - - src/cdlgmdfdm.ui - src/cdlgmdfdmaction.ui - str/cdlgmdfdmactionparam.ui - - src/cdlgmdfevents.ui - src/cdlgmdfeventdata.ui + src/cdlgmainsettings.ui + src/cdlgconnsettingslocal.ui + src/cdlgconnsettingscanal.ui + src/cdlgconnsettingstcpip.ui + src/cdlgconnsettingssocketcan.ui + src/cdlgconnsettingsmqtt.ui + src/cdlgconnsettingsws1.ui + src/cdlgconnsettingsws2.ui + src/cdlgconnsettingsudp.ui + src/cdlgconnsettingsmulticast.ui + src/cdlgconnsettingsrest.ui + src/cdlgconnsettingsrawcan.ui + src/cdlgconnsettingsrawmqtt.ui + src/cdlgnewconnection.ui + src/cdlglevel1filter.ui + src/cdlglevel1filterwizard.ui + src/cdlglevel2filter.ui + src/cdlgsocketcanflags.ui + src/cdlgmqttpublish.ui + src/cdlgmqttsubscribe.ui + src/cdlgknownguid.ui + src/cdlgeditguid.ui + src/cdlgcanfilter.ui + src/cdlgtls.ui + src/cdlglog.ui + src/cdlgsensorindex.ui + src/cdlgeditsensorindex.ui + src/cdlgtxedit.ui + src/cdlgsessionfilter.ui + src/cdlgeditsessionfilter.ui + src/cdlgselectclass.ui + src/cdlgselectguid.ui + src/cdlgselectobid.ui + src/cdlgselectdata.ui + src/cdlgselectdatasize.ui + src/cdlgselectmeasurementvalue.ui + src/cdlgselectpriority.ui + src/cdlgselectmeasurementvalue.ui + src/cdlgselecttimestamp.ui + src/cdlgselectunit.ui + src/cdlgselectsensorindex.ui + src/cdlgselectdatacoding.ui + src/cdlgselectdate.ui + src/cdlgselectconstraint.ui + src/cfrmnodeconfig.ui + src/cfrmnodescan.ui + src/cdlgactionparam.ui + src/cdlgdatepicker.ui + src/cfrmmdf.ui + src/cdlgmdfmodule.ui + src/cdlgmdffilepicture.ui + src/cdlgmdfmodule.ui + src/cdlgmdfevent.ui + src/cdlgmdffilesetup.ui + src/cdlgmdfregister.ui + src/cdlgmdfbootloader.ui + src/cdlgmdffiledriver.ui + src/cdlgmdffile.ui + src/cdlgmdfremotevar.ui + src/cdlgmdfdescription.ui + src/cdlgmdfinfourl.ui + src/cdlgmdffilefirmware.ui + src/cdlgmdffilevideo.ui + src/cdlgmdffilemanual.ui + src/cdlgmdfvaluelist.ui + src/cdlgeditmap.ui + src/cdlgmdfmanufacturer.ui + src/cdlgmdfcontact.ui + src/cdlgmdfcontactlist.ui + + src/cdlgmdfregister.ui + src/cdlgmdfregisterlist.ui + + src/cdlgmdfbit.ui + src/cdlgmdfbitlist.ui + src/cdlgmdfvalue.ui + src/cdlgmdfvaluelist.ui + + src/cdlgmdfregistermapping.ui + + src/cdlgmdfremotevar.ui + src/cdlgmdfremotevarlist.ui + + src/cdlgmdfdm.ui + src/cdlgmdfdmaction.ui + str/cdlgmdfdmactionparam.ui + + src/cdlgmdfevents.ui + src/cdlgmdfeventdata.ui ) add_executable(${PROJECT_NAME} - src/vscpworks.qrc - src/main.cpp - src/mainwindow.cpp - src/mainwindow.h - src/filedownloader.h - src/filedownloader.cpp - build/ui_cdlgnewconnection.h - src/cdlgnewconnection.h - src/cdlgnewconnection.cpp - build/ui_cdlgmainsettings.h - src/cdlgmainsettings.h - src/cdlgmainsettings.cpp - - build/ui_cdlgconnsettingslocal.h - src/cdlgconnsettingslocal.h - src/cdlgconnsettingslocal.cpp - - build/ui_cdlgconnsettingscanal.h - src/cdlgconnsettingscanal.h - src/cdlgconnsettingscanal.cpp - - build/ui_cdlgconnsettingstcpip.h - src/cdlgconnsettingstcpip.h - src/cdlgconnsettingstcpip.cpp - - build/ui_cdlgconnsettingssocketcan.h - src/cdlgconnsettingssocketcan.h - src/cdlgconnsettingssocketcan.cpp - - build/ui_cdlgsocketcanflags.h - src/cdlgsocketcanflags.h - src/cdlgsocketcanflags.cpp - - build/ui_cdlgconnsettingsmqtt.h - src/cdlgconnsettingsmqtt.h - src/cdlgconnsettingsmqtt.cpp - - build/ui_cdlgmqttpublish.h - src/cdlgmqttpublish.h - src/cdlgmqttpublish.cpp - - build/ui_cdlgmqttsubscribe.h - src/cdlgmqttsubscribe.h - src/cdlgmqttsubscribe.cpp - - build/ui_cdlgconnsettingsws1.h - src/cdlgconnsettingsws1.h - src/cdlgconnsettingsws1.cpp - - build/ui_cdlgconnsettingsws2.h - src/cdlgconnsettingsws2.h - src/cdlgconnsettingsws2.cpp - - build/ui_cdlgconnsettingsudp.h - src/cdlgconnsettingsudp.h - src/cdlgconnsettingsudp.cpp - - build/ui_cdlgconnsettingsmulticast.h - src/cdlgconnsettingsmulticast.h - src/cdlgconnsettingsmulticast.cpp - - build/ui_cdlgconnsettingsrawcan.h - src/cdlgconnsettingsrawcan.h - src/cdlgconnsettingsrawcan.cpp - - build/ui_cdlgconnsettingsrawmqtt.h - src/cdlgconnsettingsrawmqtt.h - src/cdlgconnsettingsrawmqtt.cpp - - build/ui_cdlgconnsettingsrest.h - src/cdlgconnsettingsrest.h - src/cdlgconnsettingsrest.cpp - - build/ui_cdlgknownguid.h - src/cdlgknownguid.h - src/cdlgknownguid.cpp - - src/cdlglevel1filter.h - src/cdlglevel1filter.cpp - build/ui_cdlglevel1filter.h - - src/cdlglevel1filterwizard.h - src/cdlglevel1filterwizard.cpp - build/ui_cdlglevel1filterwizard.h - - src/cdlglevel2filter.ui - src/cdlglevel2filter.h - src/cdlglevel2filter.cpp - build/ui_cdlglevel2filter.h + src/vscpworks.qrc + src/main.cpp + src/mainwindow.cpp + src/mainwindow.h + src/filedownloader.h + src/filedownloader.cpp + + src/cdlgnewconnection.ui + src/cdlgnewconnection.h + src/cdlgnewconnection.cpp + + src/cdlgmainsettings.ui + src/cdlgmainsettings.h + src/cdlgmainsettings.cpp + + src/cdlgconnsettingslocal.ui + src/cdlgconnsettingslocal.h + src/cdlgconnsettingslocal.cpp + + src/cdlgconnsettingscanal.ui + src/cdlgconnsettingscanal.h + src/cdlgconnsettingscanal.cpp + + src/cdlgconnsettingstcpip.ui + src/cdlgconnsettingstcpip.h + src/cdlgconnsettingstcpip.cpp + + src/cdlgconnsettingssocketcan.ui + src/cdlgconnsettingssocketcan.h + src/cdlgconnsettingssocketcan.cpp + + src/cdlgsocketcanflags.ui + src/cdlgsocketcanflags.h + src/cdlgsocketcanflags.cpp + + src/cdlgconnsettingsmqtt.ui + src/cdlgconnsettingsmqtt.h + src/cdlgconnsettingsmqtt.cpp + + src/cdlgmqttpublish.ui + src/cdlgmqttpublish.h + src/cdlgmqttpublish.cpp + + src/cdlgmqttsubscribe.ui + src/cdlgmqttsubscribe.h + src/cdlgmqttsubscribe.cpp + + src/cdlgconnsettingsws1.ui + src/cdlgconnsettingsws1.h + src/cdlgconnsettingsws1.cpp + + src/cdlgconnsettingsws2.ui + src/cdlgconnsettingsws2.h + src/cdlgconnsettingsws2.cpp + + src/cdlgconnsettingsudp.ui + src/cdlgconnsettingsudp.h + src/cdlgconnsettingsudp.cpp + + src/cdlgconnsettingsmulticast.ui + src/cdlgconnsettingsmulticast.h + src/cdlgconnsettingsmulticast.cpp + + src/cdlgconnsettingsrawcan.ui + src/cdlgconnsettingsrawcan.h + src/cdlgconnsettingsrawcan.cpp + + src/cdlgconnsettingsrawmqtt.ui + src/cdlgconnsettingsrawmqtt.h + src/cdlgconnsettingsrawmqtt.cpp + + src/cdlgconnsettingsrest.ui + src/cdlgconnsettingsrest.h + src/cdlgconnsettingsrest.cpp + + src/cdlgknownguid.ui + src/cdlgknownguid.h + src/cdlgknownguid.cpp + + src/cdlglevel1filter.ui + src/cdlglevel1filter.h + src/cdlglevel1filter.cpp + + src/cdlglevel1filterwizard.ui + src/cdlglevel1filterwizard.h + src/cdlglevel1filterwizard.cpp + + src/cdlglevel2filter.ui + src/cdlglevel2filter.h + src/cdlglevel2filter.cpp + + src/cdlgcanfilter.ui + src/cdlgcanfilter.h + src/cdlgcanfilter.cpp + + src/cdlgtls.ui + src/cdlgtls.h + src/cdlgtls.cpp + + src/cfrmsession.h + src/cfrmsession.cpp + src/vscpworks.h + src/vscpworks.cpp + src/canalconfigwizard.h + src/canalconfigwizard.cpp + + src/eventlistmodel.h + src/eventlistmodel.cpp + + src/cfrmnodeconfig.h + src/cfrmnodeconfig.cpp + src/cfrmnodeconfig.ui + + src/cdlgeditdm.ui + src/cdlgeditdm.h + src/cdlgeditdm.cpp - src/cdlgcanfilter.ui - src/cdlgcanfilter.h - src/cdlgcanfilter.cpp + src/cdlgactionparam.ui + src/cdlgactionparam.h + src/cdlgactionparam.cpp - src/cdlgtls.ui - src/cdlgtls.h - src/cdlgtls.cpp + src/cfrmnodescan.h + src/cfrmnodescan.cpp + src/cfrmnodescan.ui - src/cfrmsession.h - src/cfrmsession.cpp - src/vscpworks.h - src/vscpworks.cpp - src/canalconfigwizard.h - src/canalconfigwizard.cpp - - src/eventlistmodel.h - src/eventlistmodel.cpp + src/cdlgeditguid.ui + src/cdlgeditguid.h + src/cdlgeditguid.cpp - src/cfrmnodeconfig.h - src/cfrmnodeconfig.cpp - src/cfrmnodeconfig.ui + src/cdlgsensorindex.ui + src/cdlgsensorindex.h + src/cdlgsensorindex.cpp - src/cdlgeditdm.ui - src/cdlgeditdm.h - src/cdlgeditdm.cpp + src/cdlgeditsensorindex.ui + src/cdlgeditsensorindex.h + src/cdlgeditsensorindex.cpp - src/cdlgactionparam.ui - src/cdlgactionparam.h - src/cdlgactionparam.cpp + src/cdlgtxedit.ui + src/cdlgtxedit.h + src/cdlgtxedit.cpp - src/cfrmnodescan.h - src/cfrmnodescan.cpp - src/cfrmnodescan.ui + src/ctxevent.h + src/ctxevent.cpp - src/cdlgeditguid.ui - src/cdlgeditguid.h - src/cdlgeditguid.cpp + src/sessionfilter.h + src/sessionfilter.cpp - src/cdlgsensorindex.ui - src/cdlgsensorindex.h - src/cdlgsensorindex.cpp + src/cdlgsessionfilter.ui + src/cdlgsessionfilter.h + src/cdlgsessionfilter.cpp - src/cdlgeditsensorindex.ui - src/cdlgeditsensorindex.h - src/cdlgeditsensorindex.cpp - - src/cdlgtxedit.ui - src/cdlgtxedit.h - src/cdlgtxedit.cpp - - src/ctxevent.h - src/ctxevent.cpp - - src/sessionfilter.h - src/sessionfilter.cpp - - src/cdlgsessionfilter.ui - src/cdlgsessionfilter.h - src/cdlgsessionfilter.cpp - - src/cdlgeditsessionfilter.ui - src/cdlgeditsessionfilter.h - src/cdlgeditsessionfilter.cpp - - src/cdlgselectclass.ui - src/cdlgselectclass.h - src/cdlgselectclass.cpp - - src/cdlgselectguid.ui - src/cdlgselectguid.h - src/cdlgselectguid.cpp - - src/cdlgselectobid.ui - src/cdlgselectobid.h - src/cdlgselectobid.cpp - - src/cdlgselectdata.ui - src/cdlgselectdata.h - src/cdlgselectdata.cpp - - src/cdlgselectdatasize.ui - src/cdlgselectdatasize.h - src/cdlgselectdatasize.cpp - - src/cdlgselectdatacoding.ui - src/cdlgselectdatacoding.h - src/cdlgselectdatacoding.cpp - - src/cdlgselectmeasurementvalue.ui - src/cdlgselectmeasurementvalue.h - src/cdlgselectmeasurementvalue.cpp - - src/cdlgselectpriority.ui - src/cdlgselectpriority.h - src/cdlgselectpriority.cpp - - src/cdlgselecttimestamp.ui - src/cdlgselecttimestamp.h - src/cdlgselecttimestamp.cpp - - src/cdlgselectunit.ui - src/cdlgselectunit.h - src/cdlgselectunit.cpp - - src/cdlgselectsensorindex.ui - src/cdlgselectsensorindex.h - src/cdlgselectsensorindex.cpp - - src/cdlgselectdate.ui - src/cdlgselectdate.h - src/cdlgselectdate.cpp - - src/cdlgselectconstraint.ui - src/cdlgselectconstraint.h - src/cdlgselectconstraint.cpp - - src/widgetgraph.h - src/widgetgraph.cpp - - src/xyseries.h - src/xyseries.cpp - - build/ui_cdlgdatepicker.h - src/cdlgdatepicker.ui - src/cdlgdatepicker.cpp - src/cdlgdatepicker.h - - build/ui_cfrmmdf.h - src/cfrmmdf.ui - src/cfrmmdf.h - src/cfrmmdf.cpp - - build/ui_cdlgmdfmodule.h - src/cdlgmdfmodule.ui - src/cdlgmdfmodule.cpp - src/cdlgmdfmodule.h - - build/ui_cdlgmdfdescription.h - src/cdlgmdfdescription.ui - src/cdlgmdfdescription.cpp - src/cdlgmdfdescription.h - - build/ui_cdlgmdfinfourl.h - src/cdlgmdfinfourl.ui - src/cdlgmdfinfourl.cpp - src/cdlgmdfinfourl.h - - build/ui_cdlgeditmap.h - src/cdlgeditmap.ui - src/cdlgeditmap.cpp - src/cdlgeditmap.h - - build/ui_cdlgmdfmanufacturer.h - src/cdlgmdfmanufacturer.ui - src/cdlgmdfmanufacturer.cpp - src/cdlgmdfmanufacturer.h - - build/ui_cdlgmdfcontact.h - src/cdlgmdfcontact.ui - src/cdlgmdfcontact.cpp - src/cdlgmdfcontact.h - - build/ui_cdlgmdfcontactlist.h - src/cdlgmdfcontactlist.ui - src/cdlgmdfcontactlist.cpp - src/cdlgmdfcontactlist.h - - build/ui_cdlgmdfbootloader.h - src/cdlgmdfbootloader.ui - src/cdlgmdfbootloader.cpp - src/cdlgmdfbootloader.h - - build/ui_cdlgmdffilepicture.h - src/cdlgmdffilepicture.ui - src/cdlgmdffilepicture.cpp - src/cdlgmdffilepicture.h - - build/ui_cdlgmdffilevideo.h - src/cdlgmdffilevideo.ui - src/cdlgmdffilevideo.cpp - src/cdlgmdffilevideo.h - - build/ui_cdlgmdffilesetup.h - src/cdlgmdffilesetup.ui - src/cdlgmdffilesetup.cpp - src/cdlgmdffilesetup.h - - build/ui_cdlgmdffilemanual.h - src/cdlgmdffilemanual.ui - src/cdlgmdffilemanual.cpp - src/cdlgmdffilemanual.h - - build/ui_cdlgmdffilefirmware.h - src/cdlgmdffilefirmware.ui - src/cdlgmdffilefirmware.cpp - src/cdlgmdffilefirmware.h - - build/ui_cdlgmdffiledriver.h - src/cdlgmdffiledriver.ui - src/cdlgmdffiledriver.cpp - src/cdlgmdffiledriver.h - - build/ui_cdlgmdffile.h - src/cdlgmdffile.ui - src/cdlgmdffile.cpp - src/cdlgmdffile.h - - build/ui_cdlgmdfregister.h - src/cdlgmdfregister.ui - src/cdlgmdfregister.cpp - src/cdlgmdfregister.h - - build/ui_cdlgmdfregisterlist.h - src/cdlgmdfregisterlist.ui - src/cdlgmdfregisterlist.cpp - src/cdlgmdfregisterlist.h - - build/ui_cdlgmdfbit.h - src/cdlgmdfbit.ui - src/cdlgmdfbit.cpp - src/cdlgmdfbit.h - - build/ui_cdlgmdfbitlist.h - src/cdlgmdfbitlist.ui - src/cdlgmdfbitlist.cpp - src/cdlgmdfbitlist.h - - build/ui_cdlgmdfvalue.h - src/cdlgmdfvalue.ui - src/cdlgmdfvalue.cpp - src/cdlgmdfvalue.h - - build/ui_cdlgmdfvaluelist.h - src/cdlgmdfvaluelist.ui - src/cdlgmdfvaluelist.cpp - src/cdlgmdfvaluelist.h - - build/ui_cdlgmdfremotevar.h - src/cdlgmdfremotevar.ui - src/cdlgmdfremotevar.cpp - src/cdlgmdfremotevar.h - - build/ui_cdlgmdfremotevarlist.h - src/cdlgmdfremotevarlist.ui - src/cdlgmdfremotevarlist.cpp - src/cdlgmdfremotevarlist.h - - build/ui_cdlgmdfdm.h - src/cdlgmdfdm.ui - src/cdlgmdfdm.cpp - src/cdlgmdfdm.h - - build/ui_cdlgmdfdmaction.h - src/cdlgmdfdmaction.ui - src/cdlgmdfdmaction.cpp - src/cdlgmdfdmaction.h - - build/ui_cdlgmdfdmactionparam.h - src/cdlgmdfdmactionparam.ui - src/cdlgmdfdmactionparam.cpp - src/cdlgmdfdmactionparam.h - - build/ui_cdlgmdfevent.h - src/cdlgmdfevent.ui - src/cdlgmdfevent.cpp - src/cdlgmdfevent.h - - build/ui_cdlgmdfeventdata.h - src/cdlgmdfeventdata.ui - src/cdlgmdfeventdata.cpp - src/cdlgmdfeventdata.h - - ${VSCP_PATH}/src/vscp/common/version.h - ${VSCP_PATH}/src/vscp/common/vscp.h - ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h - ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp - ${VSCP_PATH}/src/vscp/common/vscpdatetime.h - ${VSCP_PATH}/src/vscp/common/vscpdatetime.cpp - ${VSCP_PATH}/src/vscp/common/guid.h - ${VSCP_PATH}/src/vscp/common/guid.cpp - ${VSCP_PATH}/src/vscp/common/mdf.h - ${VSCP_PATH}/src/vscp/common/mdf.cpp - ${VSCP_PATH}/src/vscp/common/vscphelper.h - ${VSCP_PATH}/src/vscp/common/vscphelper.cpp - ${VSCP_PATH}/src/vscp/common/canal.h - ${VSCP_PATH}/src/vscp/common/canaldlldef.h - ${VSCP_PATH}/src/vscp/common/vscpcanaldeviceif.h - ${VSCP_PATH}/src/vscp/common/vscpcanaldeviceif.cpp - ${VSCP_PATH}/src/vscp/common/canal_xmlconfig.h - ${VSCP_PATH}/src/vscp/common/canal_xmlconfig.cpp - ${VSCP_PATH}/src/vscp/common/register.h - ${VSCP_PATH}/src/vscp/common/register.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_base.h - ${VSCP_PATH}/src/vscp/common/vscp_client_base.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_local.h - ${VSCP_PATH}/src/vscp/common/vscp_client_local.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_canal.h - ${VSCP_PATH}/src/vscp/common/vscp_client_canal.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_mqtt.h - ${VSCP_PATH}/src/vscp/common/vscp_client_mqtt.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_tcp.h - ${VSCP_PATH}/src/vscp/common/vscp_client_tcp.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_socketcan.h - ${VSCP_PATH}/src/vscp/common/vscp_client_socketcan.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_ws1.h - ${VSCP_PATH}/src/vscp/common/vscp_client_ws1.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_ws2.h - ${VSCP_PATH}/src/vscp/common/vscp_client_ws2.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_udp.h - ${VSCP_PATH}/src/vscp/common/vscp_client_udp.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_multicast.h - ${VSCP_PATH}/src/vscp/common/vscp_client_multicast.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_rest.h - ${VSCP_PATH}/src/vscp/common/vscp_client_rest.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_rawcan.h - ${VSCP_PATH}/src/vscp/common/vscp_client_rawcan.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_rawmqtt.h - ${VSCP_PATH}/src/vscp/common/vscp_client_rawmqtt.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_rs232.h - ${VSCP_PATH}/src/vscp/common/vscp_client_rs232.cpp - ${VSCP_PATH}/src/vscp/common/vscp_client_rs485.h - ${VSCP_PATH}/src/vscp/common/vscp_client_rs485.cpp - ${VSCP_PATH}/src/vscp/common/vscp_bootloader.h - ${VSCP_PATH}/src/vscp/common/vscp_bootloader.cpp - ${VSCP_PATH}/src/vscp/common/vscpunit.h - ${VSCP_PATH}/src/vscp/common/vscpunit.cpp - ${VSCP_PATH}/src/common/sockettcp.h - ${VSCP_PATH}/src/common/sockettcp.c - ${VSCP_PATH}/src/common/vscpbase64.h - ${VSCP_PATH}/src/common/vscpbase64.c - ${VSCP_PATH}/src/common/vscp_aes.h - ${VSCP_PATH}/src/common/vscp_aes.c - ${VSCP_PATH}/src/common/crc.h - ${VSCP_PATH}/src/common/crc.c - ${VSCP_PATH}/src/common/crc8.h - ${VSCP_PATH}/src/common/crc8.c - ${VSCP_PATH}/src/common/vscpmd5.h - ${VSCP_PATH}/src/common/vscpmd5.c - ./third_party/mustache/mustache.hpp - #./third_party/civetweb/include/civetweb.h - #./third_party/civetweb/src/civetweb.c - ./third_party/spdlog/include/ - ./third_party/fastpbkdf2/fastpbkdf2.h - ./third_party/fastpbkdf2/fastpbkdf2.c - install/${PROJECT_NAME}.desktop - ${TS_FILES} + src/cdlgeditsessionfilter.ui + src/cdlgeditsessionfilter.h + src/cdlgeditsessionfilter.cpp + + src/cdlgselectclass.ui + src/cdlgselectclass.h + src/cdlgselectclass.cpp + + src/cdlgselectguid.ui + src/cdlgselectguid.h + src/cdlgselectguid.cpp + + src/cdlgselectobid.ui + src/cdlgselectobid.h + src/cdlgselectobid.cpp + + src/cdlgselectdata.ui + src/cdlgselectdata.h + src/cdlgselectdata.cpp + + src/cdlgselectdatasize.ui + src/cdlgselectdatasize.h + src/cdlgselectdatasize.cpp + + src/cdlgselectdatacoding.ui + src/cdlgselectdatacoding.h + src/cdlgselectdatacoding.cpp + + src/cdlgselectmeasurementvalue.ui + src/cdlgselectmeasurementvalue.h + src/cdlgselectmeasurementvalue.cpp + + src/cdlgselectpriority.ui + src/cdlgselectpriority.h + src/cdlgselectpriority.cpp + + src/cdlgselecttimestamp.ui + src/cdlgselecttimestamp.h + src/cdlgselecttimestamp.cpp + + src/cdlgselectunit.ui + src/cdlgselectunit.h + src/cdlgselectunit.cpp + + src/cdlgselectsensorindex.ui + src/cdlgselectsensorindex.h + src/cdlgselectsensorindex.cpp + + src/cdlgselectdate.ui + src/cdlgselectdate.h + src/cdlgselectdate.cpp + + src/cdlgselectconstraint.ui + src/cdlgselectconstraint.h + src/cdlgselectconstraint.cpp + + src/widgetgraph.h + src/widgetgraph.cpp + + src/xyseries.h + src/xyseries.cpp + + build/ui_cdlgdatepicker.h + src/cdlgdatepicker.ui + src/cdlgdatepicker.cpp + src/cdlgdatepicker.h + + src/cfrmmdf.ui + src/cfrmmdf.h + src/cfrmmdf.cpp + + src/cdlgmdfmodule.ui + src/cdlgmdfmodule.cpp + src/cdlgmdfmodule.h + + src/cdlgmdfdescription.ui + src/cdlgmdfdescription.cpp + src/cdlgmdfdescription.h + + src/cdlgmdfinfourl.ui + src/cdlgmdfinfourl.cpp + src/cdlgmdfinfourl.h + + src/cdlgeditmap.ui + src/cdlgeditmap.cpp + src/cdlgeditmap.h + + src/cdlgmdfmanufacturer.ui + src/cdlgmdfmanufacturer.cpp + src/cdlgmdfmanufacturer.h + + src/cdlgmdfcontact.ui + src/cdlgmdfcontact.cpp + src/cdlgmdfcontact.h + + src/cdlgmdfcontactlist.ui + src/cdlgmdfcontactlist.cpp + src/cdlgmdfcontactlist.h + + src/cdlgmdfbootloader.ui + src/cdlgmdfbootloader.cpp + src/cdlgmdfbootloader.h + + src/cdlgmdffilepicture.ui + src/cdlgmdffilepicture.cpp + src/cdlgmdffilepicture.h + + src/cdlgmdffilevideo.ui + src/cdlgmdffilevideo.cpp + src/cdlgmdffilevideo.h + + src/cdlgmdffilesetup.ui + src/cdlgmdffilesetup.cpp + src/cdlgmdffilesetup.h + + src/cdlgmdffilemanual.ui + src/cdlgmdffilemanual.cpp + src/cdlgmdffilemanual.h + + src/cdlgmdffilefirmware.ui + src/cdlgmdffilefirmware.cpp + src/cdlgmdffilefirmware.h + + src/cdlgmdffiledriver.ui + src/cdlgmdffiledriver.cpp + src/cdlgmdffiledriver.h + + src/cdlgmdffile.ui + src/cdlgmdffile.cpp + src/cdlgmdffile.h + + src/cdlgmdfregister.ui + src/cdlgmdfregister.cpp + src/cdlgmdfregister.h + + src/cdlgmdfregisterlist.ui + src/cdlgmdfregisterlist.cpp + src/cdlgmdfregisterlist.h + + src/cdlgmdfbit.ui + src/cdlgmdfbit.cpp + src/cdlgmdfbit.h + + src/cdlgmdfbitlist.ui + src/cdlgmdfbitlist.cpp + src/cdlgmdfbitlist.h + + src/cdlgmdfvalue.ui + src/cdlgmdfvalue.cpp + src/cdlgmdfvalue.h + + src/cdlgmdfvaluelist.ui + src/cdlgmdfvaluelist.cpp + src/cdlgmdfvaluelist.h + + src/cdlgmdfremotevar.ui + src/cdlgmdfremotevar.cpp + src/cdlgmdfremotevar.h + + src/cdlgmdfremotevarlist.ui + src/cdlgmdfremotevarlist.cpp + src/cdlgmdfremotevarlist.h + + src/cdlgmdfdm.ui + src/cdlgmdfdm.cpp + src/cdlgmdfdm.h + + src/cdlgmdfdmaction.ui + src/cdlgmdfdmaction.cpp + src/cdlgmdfdmaction.h + + src/cdlgmdfdmactionparam.ui + src/cdlgmdfdmactionparam.cpp + src/cdlgmdfdmactionparam.h + + src/cdlgmdfevent.ui + src/cdlgmdfevent.cpp + src/cdlgmdfevent.h + + src/cdlgmdfeventdata.ui + src/cdlgmdfeventdata.cpp + src/cdlgmdfeventdata.h + + ${VSCP_PATH}/src/vscp/common/version.h + ${VSCP_PATH}/src/vscp/common/vscp.h + ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h + ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp + ${VSCP_PATH}/src/vscp/common/vscpdatetime.h + ${VSCP_PATH}/src/vscp/common/vscpdatetime.cpp + ${VSCP_PATH}/src/vscp/common/guid.h + ${VSCP_PATH}/src/vscp/common/guid.cpp + ${VSCP_PATH}/src/vscp/common/mdf.h + ${VSCP_PATH}/src/vscp/common/mdf.cpp + ${VSCP_PATH}/src/vscp/common/vscphelper.h + ${VSCP_PATH}/src/vscp/common/vscphelper.cpp + ${VSCP_PATH}/src/vscp/common/canal.h + ${VSCP_PATH}/src/vscp/common/canaldlldef.h + ${VSCP_PATH}/src/vscp/common/vscpcanaldeviceif.h + ${VSCP_PATH}/src/vscp/common/vscpcanaldeviceif.cpp + ${VSCP_PATH}/src/vscp/common/canal_xmlconfig.h + ${VSCP_PATH}/src/vscp/common/canal_xmlconfig.cpp + ${VSCP_PATH}/src/vscp/common/register.h + ${VSCP_PATH}/src/vscp/common/register.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_base.h + ${VSCP_PATH}/src/vscp/common/vscp_client_base.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_local.h + ${VSCP_PATH}/src/vscp/common/vscp_client_local.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_canal.h + ${VSCP_PATH}/src/vscp/common/vscp_client_canal.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_mqtt.h + ${VSCP_PATH}/src/vscp/common/vscp_client_mqtt.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_tcp.h + ${VSCP_PATH}/src/vscp/common/vscp_client_tcp.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_socketcan.h + ${VSCP_PATH}/src/vscp/common/vscp_client_socketcan.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_ws1.h + ${VSCP_PATH}/src/vscp/common/vscp_client_ws1.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_ws2.h + ${VSCP_PATH}/src/vscp/common/vscp_client_ws2.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_udp.h + ${VSCP_PATH}/src/vscp/common/vscp_client_udp.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_multicast.h + ${VSCP_PATH}/src/vscp/common/vscp_client_multicast.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_rest.h + ${VSCP_PATH}/src/vscp/common/vscp_client_rest.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_rawcan.h + ${VSCP_PATH}/src/vscp/common/vscp_client_rawcan.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_rawmqtt.h + ${VSCP_PATH}/src/vscp/common/vscp_client_rawmqtt.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_rs232.h + ${VSCP_PATH}/src/vscp/common/vscp_client_rs232.cpp + ${VSCP_PATH}/src/vscp/common/vscp_client_rs485.h + ${VSCP_PATH}/src/vscp/common/vscp_client_rs485.cpp + ${VSCP_PATH}/src/vscp/common/vscp_bootloader.h + ${VSCP_PATH}/src/vscp/common/vscp_bootloader.cpp + ${VSCP_PATH}/src/vscp/common/vscpunit.h + ${VSCP_PATH}/src/vscp/common/vscpunit.cpp + ${VSCP_PATH}/src/common/sockettcp.h + ${VSCP_PATH}/src/common/sockettcp.c + ${VSCP_PATH}/src/common/vscpbase64.h + ${VSCP_PATH}/src/common/vscpbase64.c + ${VSCP_PATH}/src/common/vscp_aes.h + ${VSCP_PATH}/src/common/vscp_aes.c + ${VSCP_PATH}/src/common/crc.h + ${VSCP_PATH}/src/common/crc.c + ${VSCP_PATH}/src/common/crc8.h + ${VSCP_PATH}/src/common/crc8.c + ${VSCP_PATH}/src/common/vscpmd5.h + ${VSCP_PATH}/src/common/vscpmd5.c + ./third_party/mustache/mustache.hpp + #./third_party/civetweb/include/civetweb.h + #./third_party/civetweb/src/civetweb.c + ./third_party/spdlog/include/ + ./third_party/fastpbkdf2/fastpbkdf2.h + ./third_party/fastpbkdf2/fastpbkdf2.c + install/${PROJECT_NAME}.desktop + ${TS_FILES} ) if (MSVC) @@ -736,7 +708,6 @@ if (MSVC) ${VSCP_PATH}/src/common ./third_party ./third_party/nlohmann/include/ - #./third_party/civetweb/include ./third_party/spdlog/include/ ./third_party/mustache/ ./third_party/maddy/include/ @@ -756,8 +727,7 @@ if (MSVC) ${LOCAL_WIN_INCLUDE} ${LOCAL_SYSLOG_INCLUDE} ${CURL_INCLUDE_DIR} - ) - + ) else() include_directories( PUBLIC ./src ./build @@ -787,7 +757,6 @@ else() ${LOCAL_SYSLOG_INCLUDE} ${CURL_INCLUDE_DIR} ) - endif() if (MSVC) @@ -813,9 +782,9 @@ if (MSVC) OpenSSL::Crypto OpenSSL::SSL OpenSSL::Crypto # eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs - #${MOSQUITTO_LIBRARIES} - #${LIBWEBSOCKETS_LIBRARIES} - "${VCPKG_ROOT}/installed/x64-windows/lib/mosquitto.lib" + ${MOSQUITTO_LIBRARIES} + ${LIBWEBSOCKETS_LIBRARIES} + #"${VCPKG_ROOT}/installed/x64-windows/lib/mosquitto.lib" expat::expat CURL::libcurl dlfcn-win32::dl)