Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
5c964f32
Commit
5c964f32
authored
8 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Update CI
parent
68d0696c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.ci/linux.sh
+1
-2
1 addition, 2 deletions
.ci/linux.sh
CMakeLists.txt
+12
-1
12 additions, 1 deletion
CMakeLists.txt
README.md
+2
-3
2 additions, 3 deletions
README.md
with
15 additions
and
6 deletions
.ci/linux.sh
+
1
−
2
View file @
5c964f32
#!/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
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
12
−
1
View file @
5c964f32
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
README.md
+
2
−
3
View file @
5c964f32
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment