From 36a945eb1dd11e753bf3ee22280cc2fb2ece96f2 Mon Sep 17 00:00:00 2001 From: Lukas Heiligenbrunner Date: Tue, 13 Oct 2020 01:01:45 +0200 Subject: [PATCH] qt as conan dependency --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 8 +++----- conanfile.txt | 4 +++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d73bf0..258e181 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ cmake: script: - mkdir build - cd build - - conan install .. + - conan install .. --build=missing - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF artifacts: paths: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1953939..03085c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,14 +97,12 @@ message(STATUS "Config of Libraries") include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) - if (${GUI}) set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5PrintSupport REQUIRED) - find_package(Qt5Sql REQUIRED) + # Find the QtWidgets library + find_package(Qt5 REQUIRED COMPONENTS Widgets) endif () include_directories(inc) @@ -182,7 +180,7 @@ if (${GUI}) endif () # LINK generated LIBS # - target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig ${QT5_LIBRARIES}) + target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig CONAN_PKG::libQt5Widgets}) endif () # setting install targets diff --git a/conanfile.txt b/conanfile.txt index 8e33719..9c61c75 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,7 @@ [requires] - libcurl/7.72.0@prebuiltconanbinaries/stable + libcurl/7.72.0 + qt/5.15.1@bincrafters/stable + openssl/1.1.1h LibConfig/1.7.2@prebuiltconanbinaries/stable [generators]