From f64ebed8049746bc16e7b473fb4396a4a9f03c64 Mon Sep 17 00:00:00 2001 From: Lukas Heiligenbrunner Date: Wed, 14 Oct 2020 00:30:55 +0200 Subject: [PATCH] fix failing cmake script add repo to ci --- .gitlab-ci.yml | 2 ++ CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 258e181..6d83f06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,8 @@ cmake: script: - mkdir build - cd build + - conan remote add gitlab https://gitlab.heili.eu/api/v4/projects/55/packages/conan + - conan user lukas -r gitlab -p $CONAN_KEY - conan install .. --build=missing - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF artifacts: diff --git a/CMakeLists.txt b/CMakeLists.txt index 03085c2..d91b9a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,7 @@ enable_language(C) message("") message(STATUS "Config of Libraries") +# include conan libraries include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) @@ -150,8 +151,6 @@ add_library(libdynuiprefresher ${LIB_METHOD} add_executable(${Application_Name} src/main.cpp) -message(${CONAN_LIBS}) - # LINK generated LIBS # target_link_libraries(${Application_Name} libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig) @@ -180,7 +179,7 @@ if (${GUI}) endif () # LINK generated LIBS # - target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig CONAN_PKG::libQt5Widgets}) + target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig Qt5::Widgets) endif () # setting install targets