From 3cc4c5401d97d782486a27e7ae2b9eb0cf2b43e5 Mon Sep 17 00:00:00 2001 From: Nicolas Werner <nicolas.werner@hotmail.de> Date: Sat, 18 Jan 2020 01:22:08 +0100 Subject: [PATCH] Build only one configuration of dependencies --- .ci/script.sh | 4 +++- appveyor.yml | 2 +- cmake/Hunter/config.cmake | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/script.sh b/.ci/script.sh index dc47c8928..248b69aa6 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -22,6 +22,7 @@ if [ $TRAVIS_OS_NAME == linux ]; then -DBUILD_LIB_TESTS=ON \ -DBUILD_SHARED_LIBS=ON \ -DHUNTER_ENABLED=ON \ + #-DHUNTER_CONFIGURATION_TYPES=Debug \ << needs gtest release for some reason -DHUNTER_ROOT=/tmp/.deps \ -DUSE_BUNDLED_OPENSSL=OFF \ -DCOVERAGE=${COVERAGE} || true @@ -34,12 +35,13 @@ fi if [ $TRAVIS_OS_NAME == osx ]; then # Build the library. export OPENSSL_ROOT_DIR=/usr/local/opt/openssl - cmake -H. -Bbuild \ + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include \ -DBUILD_LIB_TESTS=OFF \ -DBUILD_SHARED_LIBS=ON \ -DHUNTER_ENABLED=ON \ + -DHUNTER_CONFIGURATION_TYPES=Release \ -DHUNTER_ROOT=/tmp/.deps \ -DUSE_BUNDLED_OPENSSL=OFF \ -DUSE_BUNDLED_GTEST=OFF || true diff --git a/appveyor.yml b/appveyor.yml index 263df30fc..aaea6353f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,5 +22,5 @@ build_script: - cmake --version - cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild -DHUNTER_ENABLED=ON -DHUNTER_ROOT="C:\hunter" - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release - cmake --build build --config Release diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index e00651c05..aee0a2606 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -1 +1 @@ -hunter_config(Boost VERSION 1.70.0) +hunter_config(Boost VERSION "1.70.0-p0") -- GitLab