Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libmueb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
KSZK
Schönherz Mátrix
libmueb
Commits
59a80b5d
Commit
59a80b5d
authored
3 years ago
by
bodzsoaa
Browse files
Options
Downloads
Patches
Plain Diff
SM-14
parent
8658f45b
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+4
-1
4 additions, 1 deletion
CMakeLists.txt
src/CMakeLists.txt
+6
-6
6 additions, 6 deletions
src/CMakeLists.txt
tests/CMakeLists.txt
+7
-3
7 additions, 3 deletions
tests/CMakeLists.txt
websocket/CMakeLists.txt
+6
-3
6 additions, 3 deletions
websocket/CMakeLists.txt
with
23 additions
and
13 deletions
CMakeLists.txt
+
4
−
1
View file @
59a80b5d
...
@@ -19,7 +19,10 @@ set(CMAKE_CXX_EXTENSIONS OFF)
...
@@ -19,7 +19,10 @@ set(CMAKE_CXX_EXTENSIONS OFF)
option
(
ENABLE_WEBSOCKET FALSE
)
option
(
ENABLE_WEBSOCKET FALSE
)
option
(
ENABLE_TESTS FALSE
)
option
(
ENABLE_TESTS FALSE
)
find_package
(
Qt5
)
find_package
(
Qt6
COMPONENTS Core Gui Network Concurrent
REQUIRED
)
add_subdirectory
(
src
)
add_subdirectory
(
src
)
if
(
ENABLE_WEBSOCKET
)
if
(
ENABLE_WEBSOCKET
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
6
−
6
View file @
59a80b5d
...
@@ -6,8 +6,8 @@ add_library(
...
@@ -6,8 +6,8 @@ add_library(
target_include_directories
(
muebtransmitter PUBLIC ../include/
${
PROJECT_NAME
}
)
target_include_directories
(
muebtransmitter PUBLIC ../include/
${
PROJECT_NAME
}
)
target_link_libraries
(
target_link_libraries
(
muebtransmitter
muebtransmitter
PUBLIC Qt
5
::Core Qt
5
::Gui
PUBLIC Qt
6
::Core Qt
6
::Gui
PRIVATE Qt
5
::Network Qt
5
::Concurrent
)
PRIVATE Qt
6
::Network Qt
6
::Concurrent
)
target_compile_definitions
(
muebtransmitter PRIVATE LIBMUEB_LIBRARY
)
target_compile_definitions
(
muebtransmitter PRIVATE LIBMUEB_LIBRARY
)
add_library
(
add_library
(
...
@@ -18,8 +18,8 @@ add_library(
...
@@ -18,8 +18,8 @@ add_library(
target_include_directories
(
muebreceiver PUBLIC ../include/
${
PROJECT_NAME
}
)
target_include_directories
(
muebreceiver PUBLIC ../include/
${
PROJECT_NAME
}
)
target_link_libraries
(
target_link_libraries
(
muebreceiver
muebreceiver
PUBLIC Qt
5
::Core Qt
5
::Gui
PUBLIC Qt
6
::Core Qt
6
::Gui
PRIVATE Qt
5
::Network
)
PRIVATE Qt
6
::Network
)
target_compile_definitions
(
muebreceiver PRIVATE LIBMUEB_LIBRARY
)
target_compile_definitions
(
muebreceiver PRIVATE LIBMUEB_LIBRARY
)
add_library
(
add_library
(
...
@@ -36,6 +36,6 @@ add_library(
...
@@ -36,6 +36,6 @@ add_library(
target_include_directories
(
mueb PUBLIC ../include/
${
PROJECT_NAME
}
)
target_include_directories
(
mueb PUBLIC ../include/
${
PROJECT_NAME
}
)
target_link_libraries
(
target_link_libraries
(
mueb
mueb
PUBLIC Qt
5
::Core Qt
5
::Gui
PUBLIC Qt
6
::Core Qt
6
::Gui
PRIVATE Qt
5
::Network Qt
5
::Concurrent
)
PRIVATE Qt
6
::Network Qt
6
::Concurrent
)
target_compile_definitions
(
mueb PRIVATE LIBMUEB_LIBRARY
)
target_compile_definitions
(
mueb PRIVATE LIBMUEB_LIBRARY
)
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
7
−
3
View file @
59a80b5d
add_executable
(
testmuebtransmitter testmuebtransmitter.cc
)
add_executable
(
testmuebtransmitter testmuebtransmitter.cc
)
target_link_libraries
(
testmuebtransmitter muebtransmitter Qt
5
::Core Qt
5
::Gui
)
target_link_libraries
(
testmuebtransmitter muebtransmitter Qt
6
::Core Qt
6
::Gui
)
add_executable
(
testmuebreceiver testmuebreceiver.cc
)
add_executable
(
testmuebreceiver testmuebreceiver.cc
)
target_link_libraries
(
testmuebreceiver muebreceiver Qt5::Core Qt5::Gui
find_package
(
Qt5::Widgets
)
Qt6
COMPONENTS Widgets
REQUIRED
)
target_link_libraries
(
testmuebreceiver muebreceiver Qt6::Core Qt6::Gui
Qt6::Widgets
)
This diff is collapsed.
Click to expand it.
websocket/CMakeLists.txt
+
6
−
3
View file @
59a80b5d
add_executable
(
libmueb-websocket-server muebwebsocketserver.h
add_executable
(
libmueb-websocket-server muebwebsocketserver.h
muebwebsocketserver.cc main.cc
)
muebwebsocketserver.cc main.cc
)
find_package
(
target_link_libraries
(
libmueb-websocket-server muebtransmitter
Qt6
PRIVATE Qt5::Core Qt5::Gui Qt5::WebSockets
)
COMPONENTS WebSockets
REQUIRED
)
target_link_libraries
(
libmueb-websocket-server
PRIVATE Qt6::Core Qt6::Gui Qt6::WebSockets muebtransmitter
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment