Skip to content

Commit 22847e1

Browse files
eliminate sit submodules
1 parent 270611e commit 22847e1

File tree

7 files changed

+13
-26
lines changed

7 files changed

+13
-26
lines changed

.gitmodules

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

libs/CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1+
# ---------------------------------------- packages --------------------------------------------------------------------
2+
# ======================================================================================================================
3+
find_package(cxxshm REQUIRED)
4+
find_package(cxxsemaphore REQUIRED)
5+
find_package(cxxopts REQUIRED)
6+
7+
# ---------------------------------------- external libs ---------------------------------------------------------------
8+
# ======================================================================================================================
9+
find_library(modbus_library modbus)
110

211
# ---------------------------------------- subdirectories --------------------------------------------------------------
312
# ======================================================================================================================
4-
include(../modbus.cmake)
5-
add_subdirectory(cxxopts EXCLUDE_FROM_ALL)
6-
add_subdirectory(cxxshm EXCLUDE_FROM_ALL)
7-
add_subdirectory(cxxsemaphore EXCLUDE_FROM_ALL)
813

914
# ---------------------------------------- link libraries --------------------------------------------------------------
1015
# ======================================================================================================================
11-
target_link_libraries(${Target} PRIVATE modbus)
16+
target_link_libraries(${Target} PRIVATE ${modbus_library})
1217
target_link_libraries(${Target} PRIVATE rt)
13-
target_link_libraries(${Target} PRIVATE cxxopts)
18+
target_link_libraries(${Target} PRIVATE INTERFACE cxxopts)
1419
target_link_libraries(${Target} PRIVATE cxxshm)
1520
target_link_libraries(${Target} PRIVATE cxxsemaphore)
16-
17-

libs/cxxopts

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

libs/cxxsemaphore

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

libs/cxxshm

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

libs/libmodbus

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

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ int main(int argc, char **argv) {
151151
cxxopts::ParseResult args;
152152
try {
153153
args = options.parse(argc, argv);
154-
} catch (cxxopts::OptionParseException &e) {
154+
} catch (cxxopts::exceptions::parsing::exception &e) {
155155
std::cerr << Print_Time::iso << " ERROR: Failed to parse arguments: " << e.what() << ".'\n";
156156
return exit_usage();
157157
}
@@ -335,7 +335,7 @@ int main(int argc, char **argv) {
335335
} catch (const std::runtime_error &e) {
336336
std::cerr << e.what() << std::endl;
337337
return EX_SOFTWARE;
338-
} catch (cxxopts::option_has_no_value_exception &e) {
338+
} catch (cxxopts::exceptions::option_has_no_value::exception &e) {
339339
std::cerr << e.what() << std::endl;
340340
return exit_usage();
341341
}

0 commit comments

Comments
 (0)