lukas/DynuIPRefresher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix failing cmake script

Browse Source 
add repo to ci
This commit is contained in:
Lukas Heiligenbrunner 2020-10-14 00:30:55 +02:00
parent 36a945eb1d
commit f64ebed804
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -10,6 +10,8 @@ cmake:
script: script:
- mkdir build - mkdir build
- cd 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 - conan install .. --build=missing
- cmake -S . -B build -D WinBuild=OFF -D GUI=OFF - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
artifacts: artifacts:

5
CMakeLists.txt
View File

@ -94,6 +94,7 @@ enable_language(C)
message("") message("")
message(STATUS "Config of Libraries") message(STATUS "Config of Libraries")
# include conan libraries
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(TARGETS) conan_basic_setup(TARGETS)
@ -150,8 +151,6 @@ add_library(libdynuiprefresher ${LIB_METHOD}
add_executable(${Application_Name} src/main.cpp) add_executable(${Application_Name} src/main.cpp)
message(${CONAN_LIBS})
# LINK generated LIBS # # LINK generated LIBS #
target_link_libraries(${Application_Name} libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig) target_link_libraries(${Application_Name} libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig)
@ -180,7 +179,7 @@ if (${GUI})
endif () endif ()
# LINK generated LIBS # # 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 () endif ()
# setting install targets # setting install targets