Skip to content

Commit 548c0a1

Browse files
remove submodules libmodbus
1 parent ed3efab commit 548c0a1

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "libs/cxxopts"]
22
path = libs/cxxopts
33
url = https://github.com/NikolasK-source/cxxopts.git
4-
[submodule "libs/libmodbus"]
5-
path = libs/libmodbus
6-
url = https://github.com/stephane/libmodbus

libs/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
# ---------------------------------------- packages --------------------------------------------------------------------
2+
# ======================================================================================================================
3+
find_package(cxxshm REQUIRED)
4+
find_package(cxxsemaphore REQUIRED)
15

2-
find_package(cxxshm)
3-
find_package(cxxsemaphore)
6+
# ---------------------------------------- external libs ---------------------------------------------------------------
7+
# ======================================================================================================================
8+
find_library(modbus_library modbus)
49

510
# ---------------------------------------- subdirectories --------------------------------------------------------------
611
# ======================================================================================================================
7-
include(../modbus.cmake)
8-
target_link_libraries(${Target} PRIVATE modbus)
12+
add_subdirectory(cxxopts EXCLUDE_FROM_ALL)
913

1014
# ---------------------------------------- link libraries --------------------------------------------------------------
1115
# ======================================================================================================================
16+
target_link_libraries(${Target} PRIVATE ${modbus_library})
1217
target_link_libraries(${Target} PRIVATE rt)
13-
14-
add_subdirectory(cxxopts EXCLUDE_FROM_ALL)
1518
target_link_libraries(${Target} PRIVATE cxxopts)
16-
1719
target_link_libraries(${Target} PRIVATE cxxshm)
1820
target_link_libraries(${Target} PRIVATE cxxsemaphore)

libs/libmodbus

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)