Skip to content

Commit b85ae34

Browse files
committed
fix filesystem compilation
1 parent 99745ed commit b85ae34

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

.travis.yml

+39
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# - master
77

88
dist: bionic
9+
osx_image: xcode11.6
10+
911
language: cpp
1012
os:
1113
- linux
@@ -16,6 +18,10 @@ compiler:
1618

1719
addons:
1820
apt:
21+
sources:
22+
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
23+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
24+
- sourceline: 'ppa:ubuntu-toolchain-r/test'
1925
packages:
2026
- libxrandr-dev
2127
- libxinerama-dev
@@ -24,6 +30,16 @@ addons:
2430
- libglu1-mesa-dev
2531
- freeglut3-dev
2632
- mesa-common-dev
33+
- clang-9
34+
- gcc-9
35+
- g++-9
36+
homebrew:
37+
packages:
38+
# - cmake
39+
# - gcc@9
40+
- llvm@10
41+
# - ninja
42+
update: true
2743

2844
jobs:
2945
# include:
@@ -41,11 +57,34 @@ jobs:
4157
env: TARGET_CPU=x86 BUILD_CONFIGURATION=Release
4258

4359
# before_install:
60+
# - sudo add-apt-repository ppa:jonathonf/gcc -y
61+
# - sudo apt-get install gcc-9 -y
4462
# - sudo apt install libxrandr-dev -y
4563
install:
4664
# скрипт настройки среды и установки зависимостей:
4765
- source travis/install-$TRAVIS_OS_NAME.sh
4866

67+
# The following Homebrew packages aren't linked by default, and need to be
68+
# prepended to the path explicitly.
69+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
70+
export PATH="$(brew --prefix llvm)/bin:$PATH";
71+
fi
72+
# /usr/bin/gcc points to an older compiler on both Linux and macOS.
73+
- if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi
74+
# /usr/bin/clang points to an older compiler on both Linux and macOS.
75+
#
76+
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
77+
# below don't work on macOS. Fortunately, the path change above makes the
78+
# default values (clang and clang++) resolve to the correct compiler on macOS.
79+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
80+
if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi;
81+
fi
82+
- echo ${CC}
83+
- echo ${CXX}
84+
- ${CXX} --version
85+
- cmake --version
86+
87+
4988
script:
5089
# скрипт сборки и тестирования проекта:
5190
- mkdir build

0 commit comments

Comments
 (0)