From 0bb52249ee5e2189c81ad87a3ebe932e0566d47d Mon Sep 17 00:00:00 2001 From: Ketut Kumajaya Date: Tue, 19 Mar 2024 22:11:56 +0700 Subject: [PATCH] Modbus: Simplify CMakeLists.txt --- src/com/modbus/CMakeLists.txt | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/com/modbus/CMakeLists.txt b/src/com/modbus/CMakeLists.txt index 98af814c..7c38e8e9 100644 --- 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)