Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
11
Issues
11
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
5c31bdde
Commit
5c31bdde
authored
Jun 09, 2018
by
Matthias Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- add OPTIONS concat
- remove whitespaces, hopefully fix CI
parent
0113d988
Pipeline
#7182
passed with stage
in 71 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CI/ci-linux.sh
CI/ci-linux.sh
+2
-2
CI/ci-mac.sh
CI/ci-mac.sh
+1
-1
No files found.
CI/ci-linux.sh
View file @
5c31bdde
...
...
@@ -11,14 +11,14 @@ MAKE_OPTIONS=""
BUILDPATH
=
""
# set GTEST path
OPTIONS
=
"
$OPTIONS
-DGTEST_ROOT=~/sw/gtest-1.8.0/"
OPTIONS
=
"
-DGTEST_ROOT=~/sw/gtest-1.8.0/"
if
[
"
$COMPILER
"
==
"gcc"
]
;
then
echo
"Building with GCC"
;
BUILDPATH
=
"gcc"
# without icecc: no options required
OPTIONS
=
"-DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
OPTIONS
=
"
$OPTIONS
-DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
MAKE_OPTIONS
=
"-j16"
export
ICECC_CXX
=
/usr/bin/g++
;
export
ICECC_CC
=
/usr/bin/gcc
...
...
CI/ci-mac.sh
View file @
5c31bdde
...
...
@@ -12,7 +12,7 @@ export PATH
OPTIONS
=
""
# set GTEST path
OPTIONS
=
"
$OPTIONS
-DGTEST_ROOT=~/sw/gtest-1.7.0/"
OPTIONS
=
"
$OPTIONS
-DGTEST_ROOT=~/sw/gtest-1.7.0/"
if
[
"
$LANGUAGE
"
==
"C++98"
]
;
then
echo
"Building with C++98"
;
...
...
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