Skip to content

Commit 7176d41

Browse files
tstennertstenner
committed
CI: update config
1 parent 3257e06 commit 7176d41

7 files changed

Lines changed: 81 additions & 131 deletions

File tree

‎.appveyor.yml‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,28 @@ pull_requests:
33
do_not_increment_build_number: true
44
shallow_clone: true
55
environment:
6-
lslversion: 1.13.0
7-
DODEPLOY: false
8-
LSLDIST_URL: "https://dl.bintray.com/labstreaminglayer/LSL"
6+
lslversion: 1.13.0-b3
7+
LSLDIST_URL: "https://github.com/sccn/liblsl/releases/download"
98
CMakeArgs: ""
109
matrix:
1110
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
12-
VCVER: 14.1
1311
QTCOMPILER: msvc2017_64
1412
QTVER: 5.11
15-
ARCH: x64
16-
DEPLOYNAME: Win64
17-
# - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
18-
# DEPLOYNAME: Linux64-xenial
13+
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
14+
DEPLOYNAME: Linux64-bionic
1915
install:
2016
- cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip -FileName ninja.zip
21-
- cmd: appveyor DownloadFile %LSLDIST_URL%/liblsl-%lslversion%-Win64-MSVC14.0.7z -FileName liblsl_x64.7z
17+
- cmd: appveyor DownloadFile %LSLDIST_URL%/%lslversion%/liblsl-%lslversion%-Win64.7z -FileName liblsl_x64.7z
2218
- cmd: 7z x ninja.zip -oC:\projects\deps\ninja > nul
2319
- cmd: 7z x liblsl_x64.7z
2420
- cmd: set PATH=C:\projects\deps\ninja;%PATH%
2521
- cmd: ninja --version
2622
- sh: set -x
27-
- sh: wget ${LSLDIST_URL}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
23+
- sh: wget ${LSLDIST_URL}/${lslversion}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
2824
- sh: dpkg -x lsl.deb LSL
2925
- sh: sudo apt update && sudo apt install -y qtbase5-dev
3026
build_script:
31-
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio %VCVER%\VC\vcvarsall.bat" %ARCH%
27+
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
3228
- mkdir build
3329
- cd build
3430
- cmd: cmake -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_67_0 -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs% ../
@@ -38,18 +34,4 @@ build_script:
3834
artifacts:
3935
- path: 'build/*.deb'
4036
- path: 'build/*.tar.*'
41-
- path: build/install
42-
name: ${APPVEYOR_PROJECT_NAME}_${lslversion}-${DEPLOYNAME}
43-
deploy:
44-
- provider: BinTray
45-
username: tstenner
46-
api_key:
47-
secure: Fo9tIQnGjVnCXB3euItvYrt85A5O9FPqq7LEpsdOuwW+eOg1rwA5Q1HLp4yWDXAl
48-
subject: labstreaminglayer
49-
version: $(lslversion)
50-
repo: LSL
51-
package: $(APPVEYOR_PROJECT_NAME)
52-
publish: true
53-
override: true
54-
on:
55-
DODEPLOY: true
37+
- path: 'build/*.7z'

‎.bintray.json‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
/build
1+
ui_*.h
2+
/build*/
23
/CMakeLists.txt.user
4+
/CMakeLists.json

‎.travis.yml‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
language: cpp
2-
dist: trusty
2+
dist: xenial
33
compiler: clang
44
env:
5-
LSLDIST_URL="https://dl.bintray.com/labstreaminglayer/LSL"
6-
UBUNTU_DIST="trusty"
7-
LSL_VERSION="1.12.0"
5+
LSLDIST_URL="https://github.com/sccn/liblsl/releases/download/"
6+
UBUNTU_DIST="xenial"
7+
LSL_VERSION="1.13.0-b3"
88
- CMakeArgs=""
9-
script:
10-
- mkdir -p build/install
11-
- cd build
12-
- cmake --version
13-
- cmake -DLSL_INSTALL_ROOT=${LSL_INSTALL_ROOT} $CMakeArgs ../
14-
- cmake --build . --config Release --target install
15-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then for app in *.app; do ${CMAKE_PREFIX_PATH}/bin/macdeployqt ${app} -dmg; mv "${app%.app}.dmg" "${app%.app}-${LSL_VERSION}-OSX64.dmg}"; done; fi
16-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack; fi
17-
- cd ..
189
matrix:
1910
include:
11+
- os: linux
12+
addons:
13+
apt:
14+
packages:
15+
- qt5-default
16+
before_script:
17+
- travis_retry wget ${LSLDIST_URL}/liblsl-${LSL_VERSION}-Linux64-${UBUNTU_DIST}.deb
18+
- dpkg -x *.deb LSL
19+
- export LSL_INSTALL_ROOT=LSL/usr
20+
- export CMakeArgs="-DLSL_UNIXFOLDERS=1 ${CMakeArgs}"
2021
- os: osx
2122
before_install:
2223
- brew install qt
2324
- export CMAKE_PREFIX_PATH=/usr/local/opt/qt/
2425
before_script:
25-
- travis_retry wget ${LSLDIST_URL}/liblsl-${LSL_VERSION}-OSX64.tar.bz2
26+
- travis_retry wget ${LSLDIST_URL}/${LSL_VERSION}/liblsl-${LSL_VERSION}-OSX64.tar.bz2
2627
- mkdir LSL; tar -xf *.tar.bz2 -C LSL
2728
- export LSL_INSTALL_ROOT=LSL
28-
deploy:
29-
skip_cleanup: true
30-
provider: bintray
31-
user: tstenner
32-
key:
33-
secure: "XHjExQrOKriFqscGnJGRwEHkdlJEmtAcNgf0CxESGdmhD6nO5nh+u3jr/5GqrSDtekjxdgD2rL4c63Oq46BRB2CDs8yWT5lT042hSI9T8pxMZlZkLFwLltX1xS/wPdkolpuqvKhf8GIX4cczETOQUoEQB7l3YDBoKLRZYwRxmbehrlECPRSvTn70brnuxdO1USdJLMw7MfYr14C4+Qs1KF+6wBSgqKAmDHZDVpFg0Js6Kkc+5RcOzQR8OkwMpDdxBx3avDDwu9Q1zwQ+LUVCKoAYDy0idKgVkQ79IPe8LVQQ0QrIkP/WtvLmheXLOpC/7eLani+FY1hdzroQcgC0lYzpt79vV12GmKHephzcxzPZWZAvmqjx+pF0XyIzi4xEGos8BeNGrWL6Jzkx7m0C++mTEhA8VotliSIQ9R0GWAdA82JLBOyPCwfcafrypAmwNNLYuwLi9NbjwHAxlL71B8jU9f543Hl5fSyLtUERIFMgjds+sGPAzFqMO/34uJTM8zurJzVy624ITqqcfL3kc6hB7zj/c9unLSkRUOztGBu1ziVVGTHijPKAB9DxyqFlYPZMz4z5httDtvuSXq6ZhfJwSdUrKkxQvGofCDNxam7NgYaNv0Cd5dpBKBxMpVekc83hJenbSsQ1sbzxPd9CJTBwVoKvUmESpHxfV3oDcrI="
34-
file: .bintray.json
29+
script:
30+
- mkdir -p build/install
31+
- cd build
32+
- cmake --version
33+
- cmake -DLSL_INSTALL_ROOT=${LSL_INSTALL_ROOT} $CMakeArgs ../
34+
- cmake --build . --config Release --target install
35+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then for app in *.app; do ${CMAKE_PREFIX_PATH}/bin/macdeployqt ${app} -dmg; mv "${app%.app}.dmg" "${app%.app}-${LSL_VERSION}-OSX64.dmg}"; done; fi
36+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack; fi
37+
- cd ..

‎CMakeLists.txt‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,7 @@ project(EGIAmpServer
44
LANGUAGES CXX
55
VERSION 2.0.0)
66

7-
# set up LSL if not done already
8-
if(NOT TARGET LSL::lsl)
9-
# when building out of tree LSL_ROOT needs to be specified on the cmd line
10-
file(TO_CMAKE_PATH "${LSL_INSTALL_ROOT}" LSL_INSTALL_ROOT)
11-
list(APPEND LSL_INSTALL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../LSL/liblsl/build/install")
12-
find_package(LSL HINTS ${LSL_INSTALL_ROOT}/share/LSL/ ${LSL_INSTALL_ROOT}/LSL/share/LSL QUIET)
13-
if(NOT LSL_FOUND)
14-
message(FATAL_ERROR "Precompiled LSL was not found. Set LSL_INSTALL_ROOT to the LSL installation path ( cmake -DLSL_INSTALL_ROOT=/path/to/installed/lsl)")
15-
endif()
16-
list(APPEND CMAKE_MODULE_PATH ${LSL_DIR})
17-
message(STATUS "Looking for LSLCMake in ${LSL_DIR}")
18-
include(LSLCMake)
19-
endif()
7+
include(Findliblsl.cmake)
208

219
# GENERAL CONFIG #
2210
set(META_PROJECT_DESCRIPTION "Stream from Philips Neuro devices via Lab Streaming Layer")

‎Findliblsl.cmake‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This file contains helper functions to make finding liblsl as easy as
2+
# possible for app authors
3+
# Usage: (optionally) set either LSL_INSTALL_ROOT to the path where liblsl was
4+
# installed / an install dir was unzipped or set LIBLSLDIR to the path where
5+
# the liblsl source code and CMakeLists.txt is
6+
# Then, include Findliblsl.cmake
7+
8+
# Findliblsl.cmake will the look for ${LSL_INSTALL_ROOT}/share/LSL/cmake/LSLConfig.cmake
9+
# or ${LIBLSLDIR}/LSLCMake.cmake and ${LIBLSLDIR}/CMakeLists.txt and either import
10+
# the "installed" precompiled liblsl or add the source directory and compile it
11+
12+
macro(lsl_found_liblsl type lslpath)
13+
message(STATUS "${type} liblsl found in ${lslpath}")
14+
list(APPEND CMAKE_MODULE_PATH ${lslpath})
15+
include(LSLCMake)
16+
return()
17+
endmacro()
18+
19+
# set up LSL if not done already
20+
if(NOT TARGET LSL::lsl)
21+
# when building out of tree LSL_INSTALL_ROOT should to be specified on the
22+
# cmd line to find a precompiled liblsl
23+
file(TO_CMAKE_PATH "${LSL_INSTALL_ROOT}" LSL_INSTALL_ROOT)
24+
list(APPEND LSL_INSTALL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../LSL/liblsl/build/install")
25+
find_package(LSL HINTS ${LSL_INSTALL_ROOT}/share/LSL/ ${LSL_INSTALL_ROOT}/LSL/share/LSL QUIET)
26+
if(LSL_FOUND)
27+
lsl_found_liblsl("Precompiled" ${LSL_DIR})
28+
endif()
29+
message(WARNING "Precompiled LSL was not found. See https://github.com/labstreaminglayer/labstreaminglayer/blob/master/doc/BUILD.md#lsl_install_root for more information.")
30+
31+
# Try to find the liblsl source directory otherwise
32+
file(TO_CMAKE_PATH "${LIBLSLDIR}" LIBLSLDIR)
33+
find_file(LSLCMAKE_PATH
34+
"LSLCMake.cmake"
35+
HINTS ${LIBLSLDIR} "${CMAKE_CURRENT_LIST_DIR}/../../LSL/liblsl"
36+
)
37+
if(LSLCMAKE_PATH)
38+
get_filename_component(LSLDIR_PATH ${LSLCMAKE_PATH} DIRECTORY CACHE)
39+
message(STATUS "${LSLCMAKE_PATH} ${LSLDIR_PATH}")
40+
add_subdirectory(${LSLDIR_PATH} liblsl)
41+
lsl_found_liblsl("Source dir for" ${LSLDIR_PATH})
42+
endif()
43+
message(WARNING "LSLCMake wasn't found in '${LIBLSLDIR}'")
44+
message(FATAL_ERROR "Neither precompiled libls nor liblsl source found")
45+
endif()

‎appveyor.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)