Skip to content

Commit 9ed49a5

Browse files
authored
Merge pull request #78 from labstreaminglayer/version_bump
Bump liblsl version to 1.16.0
2 parents 8fdaa95 + c97c65a commit 9ed49a5

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

.github/workflows/cppcmake.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212
types: ['created']
1313

1414
env:
15-
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.14.1b9'
16-
LSL_RELEASE: '1.14.1'
15+
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.16.0/'
16+
LSL_RELEASE: '1.16.0'
1717

1818
defaults:
1919
run:
@@ -30,14 +30,16 @@ jobs:
3030
config:
3131
- name: "ubuntu-20.04"
3232
os: "ubuntu-20.04"
33+
qt_ver: "6.3.0"
3334
- name: "ubuntu-18.04"
3435
os: "ubuntu-18.04"
36+
qt_ver: "5.12.12"
3537
- name: "windows-x64"
3638
os: "windows-latest"
3739
cmake_extra: "-T v142,host=x86"
3840
arch: "amd64"
3941
qt_arch: "win64_msvc2019_64"
40-
qt_ver: "6.1.0"
42+
qt_ver: "6.3.0"
4143
- name: "windows-x86"
4244
os: "windows-latest"
4345
cmake_extra: "-T v142,host=x86 -A Win32"
@@ -46,7 +48,7 @@ jobs:
4648
qt_ver: "5.15.2"
4749
- name: "macOS-10"
4850
os: "macos-10.15"
49-
qt_ver: "6.1.0"
51+
qt_ver: "6.3.0"
5052
steps:
5153
- uses: actions/checkout@v2
5254

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

70-
- name: Install Qt .deb packages
71-
if: startsWith(matrix.config.os, 'ubuntu-')
72-
run: sudo apt install -y qtbase5-dev
73-
74-
- name: Install Qt (Win and Mac)
75-
if: startsWith(matrix.config.os, 'windows') || startsWith(matrix.config.os, 'macos')
76-
uses: jurplel/install-qt-action@v2.12.2
72+
- name: Install Qt
73+
uses: jurplel/install-qt-action@v2.14.0
7774
with:
7875
version: ${{ matrix.config.qt_ver }}
7976
arch: ${{ matrix.config.qt_arch }}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project(LabRecorder
55
DESCRIPTION "Record and write LabStreamingLayer streams to an XDF file"
66
HOMEPAGE_URL "https://github.com/labstreaminglayer/App-LabRecorder/"
77
LANGUAGES C CXX
8-
VERSION 1.14.2)
8+
VERSION 1.16.0)
99

1010
# Needed for customized MacOSXBundleInfo.plist.in
1111
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" ${CMAKE_MODULE_PATH})

xdfwriter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(xdfwriter
44
DESCRIPTION "C++ library for writing XDF files"
55
HOMEPAGE_URL "https://github.com/labstreaminglayer/App-LabRecorder/"
66
LANGUAGES C CXX
7-
VERSION 1.14.1)
7+
VERSION 1.16.0)
88

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

0 commit comments

Comments
 (0)