Skip to content

Commit

Permalink
Require YARP 3.0+
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed May 14, 2019
1 parent 198deb6 commit 7889b00
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: >-
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7889b00

Please sign in to comment.