Modbus: Simplify CMakeLists.txt

eclipse-4diac · Mar 21, 2024 · a09b3a1 · a09b3a1
1 parent 2026b2b
commit a09b3a1
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/src/com/modbus/CMakeLists.txt b/src/com/modbus/CMakeLists.txt
@@ -26,20 +26,14 @@ if(FORTE_COM_MODBUS)
                  modbustimedevent )
 
   forte_add_handler(CModbusHandler modbushandler)
-      forte_add_include_directories( ${FORTE_COM_MODBUS_LIB_DIR}/include )           
+  forte_add_include_directories( ${FORTE_COM_MODBUS_LIB_DIR}/include/modbus )
+  forte_add_link_directories( ${FORTE_COM_MODBUS_LIB_DIR}/lib )
   if("${FORTE_ARCHITECTURE}" STREQUAL "Posix")
-      if(EXISTS ${FORTE_COM_MODBUS_LIB_DIR})
-        forte_add_include_directories( ${FORTE_COM_MODBUS_LIB_DIR}/include/modbus )
-        forte_add_link_directories( ${FORTE_COM_MODBUS_LIB_DIR}/lib )
-      else(EXISTS ${FORTE_COM_MODBUS_LIB_DIR})
-          forte_add_include_directories( /usr/include/modbus )
-      endif(EXISTS ${FORTE_COM_MODBUS_LIB_DIR})
-      forte_add_link_library( modbus )
-  elseif("${FORTE_ARCHITECTURE}" STREQUAL "Win32")
-    forte_add_include_directories( ${FORTE_COM_MODBUS_LIB_DIR}/include/modbus )
-    forte_add_link_directories( ${FORTE_COM_MODBUS_LIB_DIR}/lib )
-    forte_add_link_library( libmodbus.lib ) 
+    if(NOT EXISTS ${FORTE_COM_MODBUS_LIB_DIR})
+      forte_add_include_directories( /usr/include/modbus )
+      forte_add_include_directories( /usr/local/include/modbus )
+    endif()
   endif()
-
+  forte_add_link_library( modbus )
 
 endif(FORTE_COM_MODBUS)