d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update CI

Browse source
This commit is contained in:
Konstantinos Sideris 2017-04-11 19:21:11 +03:00
parent 68d0696ca4
commit 5c964f3246
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.ci/linux.sh
View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash #!/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:beineri/opt-qt562-trusty
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
sudo apt-get update -qq 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

13
CMakeLists.txt
View file

@ -52,9 +52,20 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-Wall \ -Wall \
-Wextra \ -Wextra \
-Werror \ -Werror \
-fdiagnostics-color=always \
-pedantic \ -pedantic \
-Wunreachable-code") -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() endif()
set(SRC_FILES set(SRC_FILES

5
README.md
View file

@ -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. - CMake 3.1 or greater.
- A compiler that supports C++11. - A compiler that supports C++11.
- Clang 3.3 (or greater). - Clang 3.3 (or greater).
- GCC 5 (or greater). - GCC 4.8 (or greater).
##### Arch Linux ##### Arch Linux
@ -27,11 +27,10 @@ $ sudo pacman -S qt5-base cmake gcc
##### Ubuntu 14.04 ##### Ubuntu 14.04
```bash ```bash
$ sudo add-apt-repository ppa:ubuntu-toolchain-r/test
$ sudo add-apt-repository ppa:beineri/opt-qt562-trusty $ sudo add-apt-repository ppa:beineri/opt-qt562-trusty
$ sudo add-apt-repository ppa:george-edison55/cmake-3.x $ sudo add-apt-repository ppa:george-edison55/cmake-3.x
$ sudo apt-get update $ 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) ##### OSX (Xcode 7 or later)