diff --git a/.appveyor.yml b/.appveyor.yml index 967752d..0fdbde4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -86,6 +86,9 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMP: vs2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + EXTRA: EXTRA_DEF="extra" + EXTRA1: EXTRA1_DEF="extra 1" + EXTRA2: EXTRA2_DEF="extra 2" - CMP: vs2015 - CMP: vs2013 - CMP: vs2012 diff --git a/.travis.yml b/.travis.yml index 43133a6..06a809a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,18 +50,20 @@ script: # Define build jobs # Well-known variables to use -# SET source setup file -# EXTRA content will be added to make command line -# STATIC set to YES for static build (default: NO) -# TEST set to NO to skip running the tests (default: YES) -# VV set to make build scripts verbose (default: unset) +# SET source setup file +# ADD_MODULES extra modules (for a specific job) +# EXTRA content will be added to make command line +# BCFG build configuration (static/debug/static-debug; +# default: shared-optimized) +# TEST set to NO to skip running the tests (default: YES) +# VV set to make build scripts verbose (default: unset) # Usually from setup files, but may be specified or overridden # on a job line -# MODULES list of dependency modules -# BASE branch or release tag name of the EPICS Base to use -# branch or release tag for a specific module -# ... see README for setup file syntax description +# MODULES list of dependency modules +# BASE branch or release tag name of the EPICS Base to use +# branch or release tag for a specific module +# ... see README for setup file syntax description jobs: include: @@ -96,7 +98,7 @@ jobs: - env: SET=test01 BCFG=static-debug dist: trusty - - env: SET=test01 + - env: SET=test01 EXTRA="CMD_CXXFLAGS=-std=c++11" - env: SET=test01 BCFG=static - env: SET=test01 BCFG=debug - env: SET=test01 BCFG=static-debug @@ -107,8 +109,12 @@ jobs: - env: SET=test01 BCFG=static-debug compiler: clang - - env: SET=test01 - os: osx + - os: osx + env: + - SET=test01 + - EXTRA=CMD_CFLAGS="-mmacosx-version-min=10.7" + - EXTRA1=CMD_CXXFLAGS="-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++" + - EXTRA2=CMD_LDXFLAGS="-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++" compiler: clang - env: SET=test01 BCFG=debug