Browse Source

Actually use clang++-3.4 (Travis)

Thomas Buck 10 years ago
parent
commit
857b8542a8
2 changed files with 4 additions and 0 deletions
  1. 2
    0
      cmake/travis_install_linux.sh
  2. 2
    0
      cmake/travis_script_linux.sh

+ 2
- 0
cmake/travis_install_linux.sh View File

1
 #!/bin/bash
1
 #!/bin/bash
2
 
2
 
3
 sudo apt-get -qq -y install libsdl2-dev libsdl2-ttf-dev libalut-dev libpng12-dev zlib1g-dev cmake
3
 sudo apt-get -qq -y install libsdl2-dev libsdl2-ttf-dev libalut-dev libpng12-dev zlib1g-dev cmake
4
+
4
 if [ "$CC" = "gcc" ]; then sudo apt-get install gcc-4.8; fi
5
 if [ "$CC" = "gcc" ]; then sudo apt-get install gcc-4.8; fi
5
 if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
6
 if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
7
+
6
 if [ "$CXX" = "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
8
 if [ "$CXX" = "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
7
 
9
 

+ 2
- 0
cmake/travis_script_linux.sh View File

3
 if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
3
 if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
4
 if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
4
 if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
5
 
5
 
6
+if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.4"; fi
7
+
6
 mkdir build && cd build && cmake .. && make -j 4 && make check
8
 mkdir build && cd build && cmake .. && make -j 4 && make check
7
 
9
 

Loading…
Cancel
Save