Commit 16d22725 authored by Gauthier Quesnel's avatar Gauthier Quesnel
Browse files

travis: add missing opengl library

parent c18978ee
Pipeline #14994 passed with stage
in 57 seconds
......@@ -12,10 +12,13 @@ branches:
addons:
apt:
packages: &common_packages
- mesa-common-dev
- libgles2-mesa-dev
- libglew-dev
- libglfw3-dev
- lcov
- libglvnd-dev
- cmake
- lcov
- make
- gdb
......@@ -29,7 +32,7 @@ jobs:
include:
- os: linux
dist: xenial
dist: bionic
env: USE_COVERAGE=no CC=gcc-9 CXX=g++-9 CXXFLAGS="-std=c++2a -O2 -g"
addons:
apt:
......@@ -39,7 +42,7 @@ jobs:
- *common_packages
- g++-9
- os: linux
dist: xenial
dist: bionic
env: USE_COVERAGE=yes CC=gcc-9 CXX=g++-9 CXXFLAGS="-std=c++2a -ggdb3 -O0 --coverage -fprofile-arcs -ftest-coverage"
addons:
apt:
......@@ -48,29 +51,35 @@ jobs:
packages:
- *common_packages
- g++-9
- os: linux
dist: xenial
env: USE_COVERAGE=no CC=clang-9 CXX=clang++-9 CXXFLAGS="-stdlib=libc++ -std=c++2a -O2 -g"
addons:
apt:
sources:
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
- ubuntu-toolchain-r-test
packages:
- *common_packages
- clang-9
- libc++-9-dev
- libc++abi-9-dev
- os: osx
osx_image: xcode11.2
env: USE_COVERAGE=no CC=clang CXX=clang++ CXXFLAGS="-std=c++2a -O2 -g"
# Disabled: too many std::u8string conversion errors.
# - os: linux
# dist: bionic
# env: USE_COVERAGE=no CC=clang-9 CXX=clang++-9 CXXFLAGS="-stdlib=libc++ -std=c++2a -O2 -g"
# addons:
# apt:
# sources:
# - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
# key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
# - ubuntu-toolchain-r-test
# packages:
# - *common_packages
# - clang-9
# - libc++-9-dev
# - libc++abi-9-dev
# Disabled: until add macos port.
# - os: osx
# osx_image: xcode12
# env: USE_COVERAGE=no CC=clang CXX=clang++ CXXFLAGS="-std=c++2a -O2 -g"
install:
- cd ${TRAVIS_BUILD_DIR}
before_script:
- cd ..
- cd irritator
- mkdir build
- cd build
- cmake --version
- cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None ..
script:
......@@ -79,8 +88,8 @@ script:
- ctest
after_success:
- if [[ "$USE_COVERAGE" == "yes" ]]; then cd ${TRAVIS_BUILD_DIR} ; fi
- if [[ "$USE_COVERAGE" == "yes" ]]; then lcov --directory . --capture --output-file coverage.info ; fi
- if [[ "$USE_COVERAGE" == "yes" ]]; then cd ${TRAVIS_BUILD_DIR} ; fi ; fi
- if [[ "$USE_COVERAGE" == "yes" ]]; then lcov --directory . --capture --output-file coverage.info ; fi ; fi
- if [[ "$USE_COVERAGE" == "yes" ]]; then lcov --remove coverage.info '/usr/*' --output-file coverage.info ; fi
- if [[ "$USE_COVERAGE" == "yes" ]]; then lcov --remove coverage.info 'external/*' --output-file coverage.info ; fi
- if [[ "$USE_COVERAGE" == "yes" ]]; then lcov --list coverage.info ; fi
......
......@@ -23,6 +23,7 @@ if (WIN32)
${PROJECT_SOURCE_DIR}/../../external/imgui/examples/imgui_impl_dx12.h
${PROJECT_SOURCE_DIR}/../../external/imgui/examples/imgui_impl_dx12.cpp)
else ()
set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED)
find_package(glfw3 REQUIRED)
find_package(GLEW REQUIRED)
......@@ -57,7 +58,7 @@ target_link_libraries(irritator-gui
$<$<CXX_COMPILER_ID:Clang>:c++fs>
threads
$<$<PLATFORM_ID:Linux>:dl>
$<$<PLATFORM_ID:Linux>:OpenGL::OpenGL>
$<$<PLATFORM_ID:Linux>:OpenGL::GL>
$<$<PLATFORM_ID:Linux>:glfw>
$<$<PLATFORM_ID:Windows>:d3d12>
$<$<PLATFORM_ID:Windows>:dxguid>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment