mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-22 03:00:46 +03:00
Update CI
This commit is contained in:
parent
68d0696ca4
commit
5c964f3246
3 changed files with 15 additions and 6 deletions
|
@ -1,7 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||
sudo add-apt-repository -y ppa:beineri/opt-qt562-trusty
|
||||
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
|
||||
sudo apt-get update -qq
|
||||
sudo apt-get install -qq -y gcc-6 g++-6 clang qt56base cmake
|
||||
sudo apt-get install -qq -y qt56base cmake
|
||||
|
|
|
@ -52,9 +52,20 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
|||
-Wall \
|
||||
-Wextra \
|
||||
-Werror \
|
||||
-fdiagnostics-color=always \
|
||||
-pedantic \
|
||||
-Wunreachable-code")
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
|
||||
|
||||
if (GCC_VERSION VERSION_GREATER 4.9)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(SRC_FILES
|
||||
|
|
|
@ -16,7 +16,7 @@ but you can of course receive and send messages in the rooms that you are a memb
|
|||
- CMake 3.1 or greater.
|
||||
- A compiler that supports C++11.
|
||||
- Clang 3.3 (or greater).
|
||||
- GCC 5 (or greater).
|
||||
- GCC 4.8 (or greater).
|
||||
|
||||
##### Arch Linux
|
||||
|
||||
|
@ -27,11 +27,10 @@ $ sudo pacman -S qt5-base cmake gcc
|
|||
##### Ubuntu 14.04
|
||||
|
||||
```bash
|
||||
$ sudo add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
$ sudo add-apt-repository ppa:beineri/opt-qt562-trusty
|
||||
$ sudo add-apt-repository ppa:george-edison55/cmake-3.x
|
||||
$ sudo apt-get update
|
||||
$ sudo apt-get install gcc-6 g++-6 clang qt56base cmake # or gcc-5 gcc++-5
|
||||
$ sudo apt-get install qt56base cmake
|
||||
```
|
||||
|
||||
##### OSX (Xcode 7 or later)
|
||||
|
|
Loading…
Reference in a new issue