Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
65e3fd9d
Commit
65e3fd9d
authored
Nov 21, 2018
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set OpenSSL root dir only on macOS
parent
2a7b5581
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
Jenkinsfile
Jenkinsfile
+8
-4
No files found.
Jenkinsfile
View file @
65e3fd9d
...
@@ -5,8 +5,6 @@ defaultBuildFlags = [
...
@@ -5,8 +5,6 @@ defaultBuildFlags = [
'CAF_MORE_WARNINGS:BOOL=yes'
,
'CAF_MORE_WARNINGS:BOOL=yes'
,
'CAF_ENABLE_RUNTIME_CHECKS:BOOL=yes'
,
'CAF_ENABLE_RUNTIME_CHECKS:BOOL=yes'
,
'CAF_NO_OPENCL:BOOL=yes'
,
'CAF_NO_OPENCL:BOOL=yes'
,
'OPENSSL_ROOT_DIR=/usr/local/opt/openssl'
,
'OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include'
,
]
]
// CMake flags for release builds.
// CMake flags for release builds.
...
@@ -20,6 +18,12 @@ debugBuildFlags = defaultBuildFlags + [
...
@@ -20,6 +18,12 @@ debugBuildFlags = defaultBuildFlags + [
'CAF_LOG_LEVEL:STRING=TRACE'
,
'CAF_LOG_LEVEL:STRING=TRACE'
,
]
]
// CMake flags for macOS builds only.
macBuildFlags
=
[
'OPENSSL_ROOT_DIR=/usr/local/opt/openssl'
,
'OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include'
,
]
// Our build matrix. The keys are the operating system labels and the values
// Our build matrix. The keys are the operating system labels and the values
// are lists of tool labels.
// are lists of tool labels.
buildMatrix
=
[
buildMatrix
=
[
...
@@ -32,7 +36,7 @@ buildMatrix = [
...
@@ -32,7 +36,7 @@ buildMatrix = [
[
'macOS'
,
[
[
'macOS'
,
[
builds:
[
'debug'
],
builds:
[
'debug'
],
tools:
[
'clang'
],
tools:
[
'clang'
],
cmakeArgs:
debugBuildFlags
,
cmakeArgs:
debugBuildFlags
+
macBuildFlags
,
]],
]],
// One release build per supported OS. FreeBSD and Windows have the least
// One release build per supported OS. FreeBSD and Windows have the least
// testing outside Jenkins, so we also explicitly schedule debug builds.
// testing outside Jenkins, so we also explicitly schedule debug builds.
...
@@ -44,7 +48,7 @@ buildMatrix = [
...
@@ -44,7 +48,7 @@ buildMatrix = [
[
'macOS'
,
[
[
'macOS'
,
[
builds:
[
'release'
],
builds:
[
'release'
],
tools:
[
'clang'
],
tools:
[
'clang'
],
cmakeArgs:
releaseBuildFlags
,
cmakeArgs:
releaseBuildFlags
+
macBuildFlags
,
]],
]],
[
'FreeBSD'
,
[
[
'FreeBSD'
,
[
builds:
[
'debug'
],
// no release build for now, because it takes 1h
builds:
[
'debug'
],
// no release build for now, because it takes 1h
...
...
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