Skip to content
Snippets Groups Projects
Commit 59a80b5d authored by bodzsoaa's avatar bodzsoaa
Browse files
parent 8658f45b
No related branches found
No related tags found
No related merge requests found
...@@ -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)
......
...@@ -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 Qt5::Core Qt5::Gui PUBLIC Qt6::Core Qt6::Gui
PRIVATE Qt5::Network Qt5::Concurrent) PRIVATE Qt6::Network Qt6::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 Qt5::Core Qt5::Gui PUBLIC Qt6::Core Qt6::Gui
PRIVATE Qt5::Network) PRIVATE Qt6::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 Qt5::Core Qt5::Gui PUBLIC Qt6::Core Qt6::Gui
PRIVATE Qt5::Network Qt5::Concurrent) PRIVATE Qt6::Network Qt6::Concurrent)
target_compile_definitions(mueb PRIVATE LIBMUEB_LIBRARY) target_compile_definitions(mueb PRIVATE LIBMUEB_LIBRARY)
add_executable(testmuebtransmitter testmuebtransmitter.cc) add_executable(testmuebtransmitter testmuebtransmitter.cc)
target_link_libraries(testmuebtransmitter muebtransmitter Qt5::Core Qt5::Gui) target_link_libraries(testmuebtransmitter muebtransmitter Qt6::Core Qt6::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)
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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment