Skip to content

Commit

Permalink
Merge pull request #78 from labstreaminglayer/version_bump
Browse files Browse the repository at this point in the history
Bump liblsl version to 1.16.0
  • Loading branch information
cboulay authored Apr 23, 2022
2 parents 8fdaa95 + c97c65a commit 9ed49a5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/cppcmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:
types: ['created']

env:
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.14.1b9'
LSL_RELEASE: '1.14.1'
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.16.0/'
LSL_RELEASE: '1.16.0'

defaults:
run:
Expand All @@ -30,14 +30,16 @@ jobs:
config:
- name: "ubuntu-20.04"
os: "ubuntu-20.04"
qt_ver: "6.3.0"
- name: "ubuntu-18.04"
os: "ubuntu-18.04"
qt_ver: "5.12.12"
- name: "windows-x64"
os: "windows-latest"
cmake_extra: "-T v142,host=x86"
arch: "amd64"
qt_arch: "win64_msvc2019_64"
qt_ver: "6.1.0"
qt_ver: "6.3.0"
- name: "windows-x86"
os: "windows-latest"
cmake_extra: "-T v142,host=x86 -A Win32"
Expand All @@ -46,7 +48,7 @@ jobs:
qt_ver: "5.15.2"
- name: "macOS-10"
os: "macos-10.15"
qt_ver: "6.1.0"
qt_ver: "6.3.0"
steps:
- uses: actions/checkout@v2

Expand All @@ -67,13 +69,8 @@ jobs:
if: startsWith(matrix.config.os, 'macos-')
run: brew install labstreaminglayer/tap/lsl

- name: Install Qt .deb packages
if: startsWith(matrix.config.os, 'ubuntu-')
run: sudo apt install -y qtbase5-dev

- name: Install Qt (Win and Mac)
if: startsWith(matrix.config.os, 'windows') || startsWith(matrix.config.os, 'macos')
uses: jurplel/[email protected]
- name: Install Qt
uses: jurplel/[email protected]
with:
version: ${{ matrix.config.qt_ver }}
arch: ${{ matrix.config.qt_arch }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ project(LabRecorder
DESCRIPTION "Record and write LabStreamingLayer streams to an XDF file"
HOMEPAGE_URL "https://github.com/labstreaminglayer/App-LabRecorder/"
LANGUAGES C CXX
VERSION 1.14.2)
VERSION 1.16.0)

# Needed for customized MacOSXBundleInfo.plist.in
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" ${CMAKE_MODULE_PATH})
Expand Down
2 changes: 1 addition & 1 deletion xdfwriter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(xdfwriter
DESCRIPTION "C++ library for writing XDF files"
HOMEPAGE_URL "https://github.com/labstreaminglayer/App-LabRecorder/"
LANGUAGES C CXX
VERSION 1.14.1)
VERSION 1.16.0)

option(LABRECORDER_XDFZ "use Boost.Iostreams for XDFZ support" Off)
option(LABRECORDER_BOOST_TYPE_CONVERSIONS "Use boost for type conversions" Off)
Expand Down

0 comments on commit 9ed49a5

Please sign in to comment.