From 7889b00fe586472dbe447b3c5816f02428913d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Tue, 14 May 2019 23:35:05 +0200 Subject: [PATCH] Require YARP 3.0+ https://github.com/roboticslab-uc3m/questions-and-answers/issues/83 --- .appveyor.yml | 8 ++++---- .travis.yml | 2 -- CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3d9dc613..6473650e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,7 +12,7 @@ environment: global: SDL_AUDIODRIVER: dummy ACE_VC_SLN: ACE_wrappers_vc14.sln - + matrix: - platform: Win32 cmake_generator: Visual Studio 14 2015 @@ -37,8 +37,8 @@ branches: init: # Dependency version tags - cmd: set ACE_LATEST=6.4.6 - - cmd: set YCM_LATEST=0.10.1 - - cmd: set YARP_LATEST=2.3.72 + - cmd: set YCM_LATEST=0.10.2 + - cmd: set YARP_LATEST=3.1.1 - cmd: set SDL2_LATEST=2.0.7 - cmd: set SDL2_IMAGE_LATEST=2.0.2 - cmd: set SDL2_TTF_LATEST=2.0.14 @@ -161,7 +161,7 @@ install: - cmd: '"%DOWNLOADS_PATH%\zbar.exe" /S /D=C:\ZBar' - cmd: set ZBAR_DIR=C:\ZBar - cmd: set PATH=%ZBAR_DIR%\bin;%PATH% # final PATH must give precedence to SDL2 due to overlapping versions of the zlib1.dll dependency - + # Download and extract SDL2 libraries (if not in cache) - ps: $sdl2_releases = @("$env:SDL2_LATEST", "image_$env:SDL2_IMAGE_LATEST", "ttf_$env:SDL2_TTF_LATEST", "mixer_$env:SDL2_MIXER_LATEST") - ps: >- diff --git a/.travis.yml b/.travis.yml index b87263e2..cc3930cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,6 @@ env: - YARP_CHECKOUT=master - YARP_CHECKOUT=v3.1.1 - YARP_CHECKOUT=30dce54 # hotfix for v3.0.1 - - YARP_CHECKOUT=v2.3.72.1 - - YARP_CHECKOUT=v2.3.70.2 cache: directories: $CACHE_DIR diff --git a/CMakeLists.txt b/CMakeLists.txt index e18b8430..8af3763a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake find_package(YCM 0.10 REQUIRED) find_package(COLOR_DEBUG REQUIRED) find_package(ASROB_YARP_DEVICES REQUIRED) -find_package(YARP REQUIRED) +find_package(YARP 3.0 REQUIRED COMPONENTS OS dev sig) find_package(SDL2 REQUIRED) find_package(SDL2_image REQUIRED) find_package(SDL2_mixer REQUIRED)