Commit 4f62cd4c authored by Dominik Charousset's avatar Dominik Charousset

Fix flags in build matrix

parent 6bbe993f
...@@ -5,13 +5,12 @@ ...@@ -5,13 +5,12 @@
// Default CMake flags for release builds. // Default CMake flags for release builds.
defaultReleaseBuildFlags = [ defaultReleaseBuildFlags = [
'CAF_ENABLE_RUNTIME_CHECKS:BOOL=ON', 'CAF_ENABLE_RUNTIME_CHECKS:BOOL=ON',
'CAF_ENABLE_ACTOR_PROFILER:BOOL=ON',
] ]
// Default CMake flags for debug builds. // Default CMake flags for debug builds.
defaultDebugBuildFlags = defaultReleaseBuildFlags + [ defaultDebugBuildFlags = defaultReleaseBuildFlags + [
'CAF_SANITIZERS:STRING=address,undefined',
'CAF_LOG_LEVEL:STRING=TRACE', 'CAF_LOG_LEVEL:STRING=TRACE',
'CAF_ENABLE_ACTOR_PROFILER:BOOL=ON',
] ]
// Configures the behavior of our stages. // Configures the behavior of our stages.
...@@ -31,10 +30,12 @@ config = [ ...@@ -31,10 +30,12 @@ config = [
['centos-6', [ ['centos-6', [
builds: ['debug', 'release'], builds: ['debug', 'release'],
tools: ['gcc-7'], tools: ['gcc-7'],
extraDebugFlags: ['CAF_SANITIZERS:STRING=address,undefined'],
]], ]],
['centos-7', [ ['centos-7', [
builds: ['debug', 'release'], builds: ['debug', 'release'],
tools: ['gcc-7'], tools: ['gcc-7'],
extraDebugFlags: ['CAF_SANITIZERS:STRING=address,undefined'],
]], ]],
['ubuntu-16.04', [ ['ubuntu-16.04', [
builds: ['debug', 'release'], builds: ['debug', 'release'],
...@@ -59,10 +60,16 @@ config = [ ...@@ -59,10 +60,16 @@ config = [
['macOS', [ ['macOS', [
builds: ['debug', 'release'], builds: ['debug', 'release'],
tools: ['clang'], tools: ['clang'],
extraFlags: [
'OPENSSL_ROOT_DIR=/usr/local/opt/openssl',
'OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include',
],
extraDebugFlags: ['CAF_SANITIZERS:STRING=address,undefined'],
]], ]],
['FreeBSD', [ ['FreeBSD', [
builds: ['debug', 'release'], builds: ['debug', 'release'],
tools: ['clang'], tools: ['clang'],
extraDebugFlags: ['CAF_SANITIZERS:STRING=address,undefined'],
]], ]],
// Non-UNIX systems. // Non-UNIX systems.
['Windows', [ ['Windows', [
...@@ -70,6 +77,7 @@ config = [ ...@@ -70,6 +77,7 @@ config = [
//builds: ['debug', 'release'], //builds: ['debug', 'release'],
builds: ['release'], builds: ['release'],
tools: ['msvc'], tools: ['msvc'],
extraFlags: ['CAF_ENABLE_OPENSSL_MODULE:BOOL=OFF'],
]], ]],
], ],
// Platform-specific environment settings. // Platform-specific environment settings.
...@@ -83,24 +91,12 @@ config = [ ...@@ -83,24 +91,12 @@ config = [
], ],
// CMake flags by OS and build type to override defaults for individual builds. // CMake flags by OS and build type to override defaults for individual builds.
buildFlags: [ buildFlags: [
macOS: [ nop: [],
debug: defaultDebugBuildFlags + [ ],
'OPENSSL_ROOT_DIR=/usr/local/opt/openssl', // Default CMake flags by build type.
'OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include', defaultBuildFlags: [
], debug: defaultDebugBuildFlags,
release: defaultReleaseBuildFlags + [ release: defaultReleaseBuildFlags,
'OPENSSL_ROOT_DIR=/usr/local/opt/openssl',
'OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include',
],
],
Windows: [
debug: defaultDebugBuildFlags + [
'CAF_ENABLE_OPENSSL_MODULE:BOOL=OFF',
],
release: defaultReleaseBuildFlags + [
'CAF_ENABLE_OPENSSL_MODULE:BOOL=OFF',
],
],
], ],
// Configures what binary the coverage report uses and what paths to exclude. // Configures what binary the coverage report uses and what paths to exclude.
coverage: [ coverage: [
......
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