Commit 8b238b72 authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'topic/jenkins'

parents 2bef845e 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment