Skip to content

Commit d52f02a

Browse files
authored
Merge pull request #97 from labstreaminglayer/cboulay/update_liblsl
Update liblsl to 1.16.2
2 parents 3229a7a + 8ff92f8 commit d52f02a

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.github/workflows/cppcmake.yml

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

1515
env:
16-
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.16.0/'
17-
LSL_RELEASE: '1.16.0'
16+
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download'
17+
LSL_RELEASE: '1.16.2'
1818

1919
defaults:
2020
run:
@@ -33,9 +33,6 @@ jobs:
3333
os: "ubuntu-22.04"
3434
- name: "ubuntu-20.04"
3535
os: "ubuntu-20.04"
36-
- name: "ubuntu-18.04"
37-
os: "ubuntu-18.04"
38-
qt_ver: "5.12.12"
3936
- name: "windows-x64"
4037
os: "windows-latest"
4138
cmake_extra: "-T v142,host=x86"
@@ -48,30 +45,30 @@ jobs:
4845
arch: "i386"
4946
qt_arch: "win32_msvc2019"
5047
qt_ver: "5.15.2"
51-
- name: "macOS-10"
52-
os: "macos-10.15"
48+
- name: "macOS-latest"
49+
os: "macOS-latest"
5350
steps:
5451
- uses: actions/checkout@v3
5552

5653
- name: Install liblsl (Ubuntu)
5754
if: startsWith(matrix.config.os, 'ubuntu-')
5855
run: |
5956
sudo apt install -y libpugixml-dev
60-
curl -L ${LSL_RELEASE_URL}/liblsl-${LSL_RELEASE}-$(lsb_release -sc)_amd64.deb -o liblsl.deb
57+
curl -L ${LSL_RELEASE_URL}/v${LSL_RELEASE}/liblsl-${LSL_RELEASE}-$(lsb_release -sc)_amd64.deb -o liblsl.deb
6158
sudo apt install ./liblsl.deb
6259
6360
- name: Download liblsl (Windows)
6461
if: matrix.config.os == 'windows-latest'
6562
run: |
66-
curl -L ${LSL_RELEASE_URL}/liblsl-${LSL_RELEASE}-Win_${{ matrix.config.arch}}.zip -o liblsl.zip
63+
curl -L ${LSL_RELEASE_URL}/v${LSL_RELEASE}/liblsl-${LSL_RELEASE}-Win_${{ matrix.config.arch}}.zip -o liblsl.zip
6764
7z x liblsl.zip -oLSL
6865
6966
- name: Download liblsl (macOS)
7067
if: startsWith(matrix.config.os, 'macos-')
7168
run: brew install labstreaminglayer/tap/lsl
7269

73-
- name: Install Qt (Window and Ubuntu bionic)
74-
if: (matrix.config.os == 'windows-latest') || (matrix.config.os == 'ubuntu-18.04')
70+
- name: Install Qt (Window)
71+
if: (matrix.config.os == 'windows-latest')
7572
uses: jurplel/install-qt-action@v3.0.0
7673
with:
7774
version: ${{ matrix.config.qt_ver }}

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.16.3)
8+
VERSION 1.16.4)
99

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

0 commit comments

Comments
 (0)