Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenMesh
OpenMesh
Commits
a6a73227
Commit
a6a73227
authored
Feb 06, 2017
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Remove_cpp98' into 'master'
Remove cpp98 See merge request
!125
parents
aa088250
aa6e1ece
Pipeline
#4235
passed with stage
in 41 minutes and 53 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
.gitlab-ci.yml
.gitlab-ci.yml
+7
-7
CI/ci-linux.sh
CI/ci-linux.sh
+4
-0
CI/ci-mac.sh
CI/ci-mac.sh
+4
-0
No files found.
.gitlab-ci.yml
View file @
a6a73227
...
...
@@ -8,13 +8,13 @@ clang-c++11:
tags
:
-
Linux
gcc-c++
98
:
script
:
"
CI/ci-linux.sh
gcc
C++
98
"
gcc-c++
14
:
script
:
"
CI/ci-linux.sh
gcc
C++
14
"
tags
:
-
Linux
clang-c++
98
:
script
:
"
CI/ci-linux.sh
clang
C++
98
"
clang-c++
14
:
script
:
"
CI/ci-linux.sh
clang
C++
14
"
tags
:
-
Linux
...
...
@@ -28,13 +28,13 @@ macos-c++11:
-
build-release-cpp11/*.tar.gz
macos-c++98
:
script
:
"
CI/ci-mac.sh
C++
98
"
script
:
"
CI/ci-mac.sh
C++
14
"
tags
:
-
Apple
artifacts
:
paths
:
-
build-release-cpp
98
/*.dmg
-
build-release-cpp
98
/*.tar.gz
-
build-release-cpp
14
/*.dmg
-
build-release-cpp
14
/*.tar.gz
cppcheck
:
script
:
"
CI/ci-cppcheck.sh"
...
...
CI/ci-linux.sh
View file @
a6a73227
...
...
@@ -33,6 +33,10 @@ elif [ "$LANGUAGE" == "C++11" ]; then
echo
"Building with C++11"
;
OPTIONS
=
"
$OPTIONS
-DCMAKE_CXX_FLAGS='-std=c++11' "
BUILDPATH
=
"
$BUILDPATH
-cpp11"
elif
[
"
$LANGUAGE
"
==
"C++14"
]
;
then
echo
"Building with C++14"
;
OPTIONS
=
"
$OPTIONS
-DCMAKE_CXX_FLAGS='-std=c++14' "
BUILDPATH
=
"
$BUILDPATH
-cpp14"
fi
#=====================================
...
...
CI/ci-mac.sh
View file @
a6a73227
...
...
@@ -18,6 +18,10 @@ elif [ "$LANGUAGE" == "C++11" ]; then
echo
"Building with C++11"
;
OPTIONS
=
"
$OPTIONS
-DCMAKE_CXX_FLAGS='-std=c++11' "
BUILDPATH
=
"cpp11"
elif
[
"
$LANGUAGE
"
==
"C++14"
]
;
then
echo
"Building with C++14"
;
OPTIONS
=
"
$OPTIONS
-DCMAKE_CXX_FLAGS='-std=c++14' "
BUILDPATH
=
"cpp14"
fi
#=====================================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment