Skip to content

Bump liblsl version to 1.16.0 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cboulay merged 2 commits into from
Apr 23, 2022
Merged

Bump liblsl version to 1.16.0 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7504838
Bump liblsl version to 1.16.0
cboulay Apr 23, 2022
c97c65a
Bump Qt versions in GH actions
cboulay Apr 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions .github/workflows/cppcmake.yml
View file
Open in desktop
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/install-qt-action@v2.12.2
- name: Install Qt
uses: jurplel/install-qt-action@v2.14.0
with:
version: ${{ matrix.config.qt_ver }}
arch: ${{ matrix.config.qt_arch }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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