generic opcua client: node_event_manager.* is mooved to tms; DAQMODULES_OPCUA_ENABLE_GENERIC_CLIENT flag;

Author: Viacheslav Kalenikov

CMakeLists.txt

@@ -31,6 +31,7 @@ opendaq_setup_project_specific_build_options(${REPO_OPTION_PREFIX})
 option(${REPO_OPTION_PREFIX}_ENABLE_EXAMPLE_APP "Enable ${REPO_NAME} example applications" ${PROJECT_IS_TOP_LEVEL})
 option(${REPO_OPTION_PREFIX}_ENABLE_TESTS "Enable ${REPO_NAME} testing" ${PROJECT_IS_TOP_LEVEL})
 option(${REPO_OPTION_PREFIX}_ENABLE_CLIENT "Enable ${REPO_NAME} client module" ${PROJECT_IS_TOP_LEVEL})
+option(${REPO_OPTION_PREFIX}_ENABLE_GENERIC_CLIENT "Enable ${REPO_NAME} client module" ${PROJECT_IS_TOP_LEVEL})
 option(${REPO_OPTION_PREFIX}_ENABLE_SERVER "Enable ${REPO_NAME} server module" ${PROJECT_IS_TOP_LEVEL})
 option(OPCUA_ENABLE_ENCRYPTION "Enable OpcUa encryption" OFF)
 cmake_dependent_option(OPENDAQ_ENABLE_OPCUA_INTEGRATION_TESTS "Enable ${REPO_NAME} integration testing" ${PROJECT_IS_TOP_LEVEL} "${REPO_OPTION_PREFIX}_ENABLE_TESTS" OFF)

modules/CMakeLists.txt

@@ -6,6 +6,9 @@ endif()
 
 if (${REPO_OPTION_PREFIX}_ENABLE_CLIENT)
     add_subdirectory(opcua_client_module)
+endif()
+
+if (${REPO_OPTION_PREFIX}_ENABLE_GENERIC_CLIENT)
     add_subdirectory(opcua_generic_client_module)
 endif()
 

modules/opcua_generic_client_module/src/CMakeLists.txt

@@ -32,7 +32,6 @@ if (MSVC)
 endif()
 
 target_link_libraries(${LIB_NAME} PUBLIC  ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq
-                                          Boost::uuid
                                   PRIVATE ${OPENDAQ_SDK_TARGET_NAMESPACE}::discovery
                                           ${OPENDAQ_SDK_TARGET_NAMESPACE}::opcuageneric_client
 )

shared/libraries/CMakeLists.txt

@@ -1,5 +1,12 @@
 opendaq_set_cmake_folder_context(TARGET_FOLDER_NAME)
 
 add_subdirectory(opcua)
-add_subdirectory(opcuatms)
-add_subdirectory(opcuageneric)
+
+if (${REPO_OPTION_PREFIX}_ENABLE_CLIENT OR ${REPO_OPTION_PREFIX}_ENABLE_SERVER)
+    add_subdirectory(opcuatms)
+endif()
+
+if (${REPO_OPTION_PREFIX}_ENABLE_GENERIC_CLIENT)
+    add_subdirectory(opcuageneric)
+endif()
+

shared/libraries/opcua/opcuaserver/src/CMakeLists.txt

@@ -6,7 +6,6 @@ set(SOURCE_CPPS opcuaserver.cpp
                 opcuataskqueue.cpp
                 opcuaaddnodeparams.cpp
                 opcuatmstypes.cpp
-                node_event_manager.cpp
                 opcuaservernode.cpp
                 opcuaservernodefactory.cpp
                 event_attributes.cpp
@@ -20,7 +19,6 @@ set(SOURCE_HEADERS common.h
                    opcuataskqueue.h
                    opcuatmstypes.h
                    opcuaaddnodeparams.h
-                   node_event_manager.h
                    opcuaservernode.h
                    opcuaservernodefactory.h
                    event_attributes.h
@@ -47,7 +45,6 @@ target_link_libraries(${MODULE_NAME} PUBLIC  ${OPENDAQ_SDK_TARGET_NAMESPACE}::op
                                              ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq_utils
                                      PRIVATE ${OPENDAQ_SDK_TARGET_NAMESPACE}::opcua_daq_types
                                              ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq
-                                             ${OPENDAQ_SDK_TARGET_NAMESPACE}::opcuatms_server
 )
 
 set_target_properties(${MODULE_NAME} PROPERTIES PUBLIC_HEADER "${SOURCE_HEADERS}")

shared/libraries/opcuageneric/opcuageneric_client/tests/CMakeLists.txt

@@ -27,7 +27,6 @@ endif()
 
 target_link_libraries(${TEST_APP} PRIVATE ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq_test_utils gtest
                                           ${OPENDAQ_SDK_TARGET_NAMESPACE}::opcuageneric_client
-                                          ${OPENDAQ_SDK_TARGET_NAMESPACE}::${MODULE_NAME}
                                           ${OPENDAQ_SDK_TARGET_NAMESPACE}::opcua_generic_client_module
 )
 

…include/opcuaserver/node_event_manager.h …ude/opcuatms_server/node_event_manager.hshared/libraries/opcua/opcuaserver/include/opcuaserver/node_event_manager.h renamed to shared/libraries/opcuatms/opcuatms_server/include/opcuatms_server/node_event_manager.h shared/libraries/opcua/opcuaserver/include/opcuaserver/node_event_manager.h renamed to shared/libraries/opcuatms/opcuatms_server/include/opcuatms_server/node_event_manager.h

@@ -18,7 +18,7 @@
 #include <coretypes/constexpr_utils.h>
 #include <opendaq/component_ptr.h>
 #include <opendaq/signal_ptr.h>
-#include <opcuaserver/node_event_manager.h>
+#include <opcuatms_server/node_event_manager.h>
 #include <opcuaserver/opcuaserver.h>
 #include <opcuatms/opcuatms.h>
 

shared/libraries/opcuatms/opcuatms_server/include/opcuatms_server/objects/tms_server_object.h

@@ -2,13 +2,15 @@ set(LIB_NAME opcuatms_server)
 
 set(SRC_Cpp tms_server.cpp
             tms_server_context.cpp
+            node_event_manager.cpp
 )
 
 set(SRC_PublicHeaders
 )
 
 set(SRC_PrivateHeaders tms_server.h
                        tms_server_context.h
+                       node_event_manager.h
 )
 
 # objects

shared/libraries/opcuatms/opcuatms_server/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-#include "opcuaserver/node_event_manager.h"
+#include "opcuatms_server/node_event_manager.h"
 #include <opcuatms_server/objects/tms_server_object.h>
 
 BEGIN_NAMESPACE_OPENDAQ_OPCUA