From 3d4f302c54b6348907f9f9d8d847f7a5372e045f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodn=C3=A1r=20Zsombor?= <bodzsoaa@sch.bme.hu>
Date: Wed, 16 Jun 2021 20:46:25 +0200
Subject: [PATCH] SM-14
---
CMakeLists.txt | 2 +-
conanfile.py | 2 +-
src/CMakeLists.txt | 15 ++++++++++++---
tests/CMakeLists.txt | 5 +++--
websocket/CMakeLists.txt | 3 ++-
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfa7855..0e7705a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
option(ENABLE_WEBSOCKET FALSE)
option(ENABLE_TESTS FALSE)
-find_package(qt)
+find_package(Qt5)
add_subdirectory(src)
if(ENABLE_WEBSOCKET)
diff --git a/conanfile.py b/conanfile.py
index 366d0d5..fd144f4 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -15,7 +15,7 @@ class LibmuebConan(ConanFile):
default_options = {"shared": True, "*:shared": True, "fPIC": True, "websocket": False, "tests": False}
requires = "qt/[^5.15.2]"
build_requires = "cmake/[^3.17.0]", "ninja/1.10.2"
- generators = "cmake_find_package"
+ generators = "cmake_find_package", "cmake_paths"
exports_sources = "CMakeLists.txt", "!CMakeLists.txt.user", "include/*", "src/*", "websocket/*", "tests/*"
def configure(self):
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d77130..30526d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,10 @@ add_library(
${CMAKE_SOURCE_DIR}/include/libmueb/muebtransmitter.h configuration.h
muebtransmitter_p.h muebtransmitter.cc configuration.cc)
target_include_directories(muebtransmitter PUBLIC ../include/${PROJECT_NAME})
-target_link_libraries(muebtransmitter qt::qt)
+target_link_libraries(
+ muebtransmitter
+ PUBLIC Qt5::Core Qt5::Gui
+ PRIVATE Qt5::Network Qt5::Concurrent)
target_compile_definitions(muebtransmitter PRIVATE LIBMUEB_LIBRARY)
add_library(
@@ -13,7 +16,10 @@ add_library(
${CMAKE_SOURCE_DIR}/include/libmueb/muebreceiver.h configuration.h
muebreceiver_p.h muebreceiver.cc configuration.cc)
target_include_directories(muebreceiver PUBLIC ../include/${PROJECT_NAME})
-target_link_libraries(muebreceiver qt::qt)
+target_link_libraries(
+ muebreceiver
+ PUBLIC Qt5::Core Qt5::Gui
+ PRIVATE Qt5::Network)
target_compile_definitions(muebreceiver PRIVATE LIBMUEB_LIBRARY)
add_library(
@@ -28,5 +34,8 @@ add_library(
muebreceiver.cc
configuration.cc)
target_include_directories(mueb PUBLIC ../include/${PROJECT_NAME})
-target_link_libraries(mueb qt::qt)
+target_link_libraries(
+ mueb
+ PUBLIC Qt5::Core Qt5::Gui
+ PRIVATE Qt5::Network Qt5::Concurrent)
target_compile_definitions(mueb PRIVATE LIBMUEB_LIBRARY)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0cb2daf..2716770 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,8 @@
add_executable(testmuebtransmitter testmuebtransmitter.cc)
-target_link_libraries(testmuebtransmitter muebtransmitter qt::qt)
+target_link_libraries(testmuebtransmitter muebtransmitter Qt5::Core Qt5::Gui)
add_executable(testmuebreceiver testmuebreceiver.cc)
-target_link_libraries(testmuebreceiver muebreceiver qt::qt)
+target_link_libraries(testmuebreceiver muebreceiver Qt5::Core Qt5::Gui
+ Qt5::Widgets)
diff --git a/websocket/CMakeLists.txt b/websocket/CMakeLists.txt
index 642154b..6ac66f1 100644
--- a/websocket/CMakeLists.txt
+++ b/websocket/CMakeLists.txt
@@ -1,4 +1,5 @@
add_executable(libmueb-websocket-server muebwebsocketserver.h
muebwebsocketserver.cc main.cc)
-target_link_libraries(libmueb-websocket-server muebtransmitter qt::qt)
+target_link_libraries(libmueb-websocket-server muebtransmitter
+ PRIVATE Qt5::Core Qt5::Gui Qt5::WebSockets)
--
GitLab