Wago updates

src/modules/wagokbus/CMakeLists.txt

@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2016 fortiss GmbH
+# Copyright (c) 2016, 2024 fortiss GmbH
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
 # http://www.eclipse.org/legal/epl-2.0.
@@ -8,7 +8,7 @@
 # 
 # Contributors:
 #     Milan Vathoopan, Alois Zoitl - initial API and implementation and/or initial documentation
-# *    Jose Cabral - Add modular IOs
+#     Jose Cabral - Add modular IOs
 # *******************************************************************************/ 
 #############################################################################
 # WAGO KBUS SIFBs
@@ -19,14 +19,11 @@ forte_add_module(WagoKbus OFF "Wago Kbus interface")
 if(FORTE_MODULE_WagoKbus)
     # All Wago depedencies are added here
     if(FORTE_IO)
-      add_subdirectory(modular)
-      message("Building New Modular wago IOs")
-    else(FORTE_IO)
-      message("Building Old wago IOs")
       forte_add_include_directories(${CMAKE_CURRENT_SOURCE_DIR})  
-      forte_add_sourcefile_hcpp(processinterface)
-      forte_set_process_interface("Wago Kbus" IX QX IW QW)
-      forte_add_handler(WagoPFCProcessInterface::CKBusHandler processinterface) 
+      forte_add_sourcefile_hcpp(wagoHandle wagoDeviceController)
+      forte_add_sourcefile_hcpp(types/WagoMaster types/WagoBusAdapter types/wagoSlaveBase)
+      forte_add_sourcefile_hcpp(types/Wago1506 types/Wago1405_6 types/Wago1504_5 types/Wago459)
+      message("Building Modular Wago IOs")
     endif(FORTE_IO)
 
     SET(FORTE_WAGO_INCLUDE_DIR "" CACHE STRING "Path where the include for wago is found") 
@@ -37,9 +34,8 @@ if(FORTE_MODULE_WagoKbus)
     forte_add_include_system_directories(${FORTE_WAGO_INCLUDE_DIR}/OsLinux)
     forte_add_link_directories(${FORTE_WAGO_LIB_DIR})
 
-    forte_add_link_library(libdal.a liblibloader.so libpthread.so libffi.so libdbus-glib-1.so libglib-2.0.so librt.so)
-    forte_add_link_library(libtypelabel.so liboslinux.so libdbuskbuscommon.so)    
-    forte_add_link_flags("-Wall") 
+    forte_add_link_library(dal libloader pthread ffi dbus-glib-1 glib-2.0)
+    forte_add_link_library(typelabel oslinux dbuskbuscommon)
 
     #TODO: Further dependencies are to be checked and added later