From 3e5ffff839c24ebbc147430d8c3938917f4cd379 Mon Sep 17 00:00:00 2001 From: Lukas Heiligenbrunner Date: Fri, 30 Oct 2020 19:16:16 +0100 Subject: [PATCH] force using cmake generator and set build folder manually --- .gitlab-ci.yml | 3 +-- conanfile.txt | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d932ad2..388a0cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,10 @@ conan: stage: conan script: - mkdir -p build - - cd build - conan remote add bintray https://api.bintray.com/conan/lheili/LibConfig - conan user lukas-heiligenbrunner -r bintray -p $CONAN_KEY - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan - - CONAN_SYSREQUIRES_MODE=enabled conan install .. --build=missing + - CONAN_SYSREQUIRES_MODE=enabled conan install . --build=missing -g cmake -if build allow_failure: true # Unix Build diff --git a/conanfile.txt b/conanfile.txt index f779ab7..5244a8e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,9 +1,9 @@ - [requires] - libcurl/7.72.0 - qt/5.15.1@bincrafters/stable - openssl/1.1.1h - LibConfig/1.7.2@LibConfig/stable +[requires] +libcurl/7.72.0 +qt/5.15.1@bincrafters/stable +openssl/1.1.1h +LibConfig/1.7.2@LibConfig/stable - [generators] - cmake +[generators] +cmake