File tree Expand file tree Collapse file tree 4 files changed +25
-7
lines changed Expand file tree Collapse file tree 4 files changed +25
-7
lines changed Original file line number Diff line number Diff line change 3030* .exe
3131* .out
3232* .app
33-
3433build
3534
35+ # Windows specific
36+ out
37+ .vs
38+
3639# Gtags
3740GTAGS
3841GRTAGS
Original file line number Diff line number Diff line change 11cmake_minimum_required (VERSION 3.13)
2- project (protocolConverter )
2+ project (modbus )
33
44set (CMAKE_CXX_STANDARD 17)
55
66set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -pedantic" )
77
88option (MODBUS_EXAMPLE "Build example program" OFF )
99option (MODBUS_TESTS "Build tests" OFF )
10- option (MODBUS_COMMUNICATION "Use Modbus communication library" ON )
10+ option (MODBUS_TCP_COMMUNICATION "Use Modbus TCP communication library" ON )
11+
12+ if (NOT win32 )
13+ # Serial not supported on Windows
14+ option (MODBUS_SERIAL_COMMUNICATION "Use Modbus serial communication library" OFF ) # not supported by windows platform
15+ else ()
16+ message (STATUS "Modbus Serial not supported on Windows." )
17+ endif ()
1118
1219add_subdirectory (src)
1320
Original file line number Diff line number Diff line change @@ -23,10 +23,14 @@ target_include_directories(Modbus_Core PUBLIC ${PROJECT_SOURCE_DIR}/include PRIV
2323add_library (Modbus)
2424target_link_libraries (Modbus Modbus_Core)
2525
26+ if (MODBUS_SERIAL_COMMUNICATION)
27+ message (STATUS "Enabling Modbus Serial" )
28+ add_subdirectory (Serial)
29+ target_link_libraries (Modbus Modbus_Serial)
30+ endif ()
2631
27- if (MODBUS_COMMUNICATION )
28- message (" Modbus communication is experimental " )
32+ if (MODBUS_TCP_COMMUNICATION )
33+ message (STATUS "Enabling Modbus Serial " )
2934 add_subdirectory (TCP)
30- add_subdirectory (Serial)
31- target_link_libraries (Modbus Modbus_TCP Modbus_Serial)
35+ target_link_libraries (Modbus Modbus_TCP)
3236endif ()
Original file line number Diff line number Diff line change @@ -2,6 +2,10 @@ project(Google_tests)
22add_subdirectory (googletest)
33include_directories (${gtest_SOURCE_DIR} /include ${gtest_SOURCE_DIR} )
44
5+ if (MSVC )
6+ set (gtest_force_shared_crt on )
7+ endif ()
8+
59set (TestFiles MB/ModbusRequestTests.cpp
610 MB/ModbusResponseTests.cpp
711 MB/ModbusExceptionTests.cpp
You can’t perform that action at this time.
0 commit comments