From 5c166e6cdcde46b5a417ed7f4838851784545a0e Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Wed, 17 Oct 2018 17:44:31 -0600 Subject: [PATCH] travis: Fix `COMPOSITE_SOURCE_EXCLUSIONS` being passed to CMake --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3d56045a5..48014b4e01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: env: BUILD_METALIBS=ON COMPOSITE_SOURCE_LIMIT=0 include: - os: osx - env: BUILD_METALIBS=ON COMPOSITE_SOURCE_LIMIT=30 COMPOSITE_SOURCE_EXCLUSIONS=p3showbase;p3dtoolutil;p3cocoadisplay;p3osxdisplay;p3tinydisplay;p3display + env: BUILD_METALIBS=ON COMPOSITE_SOURCE_LIMIT=30 COMPOSITE_SOURCE_EXCLUSIONS='p3showbase;p3dtoolutil;p3cocoadisplay;p3osxdisplay;p3tinydisplay;p3display' - compiler: gcc addons: @@ -91,10 +91,12 @@ script: fi cmake -DBUILD_METALIBS=$BUILD_METALIBS \ + -DCOMPOSITE_SOURCE_EXCLUSIONS="$COMPOSITE_SOURCE_EXCLUSIONS" \ -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $PY2_CMAKE_ARGS .. else cmake -DHAVE_GTK2=NO -DBUILD_METALIBS=$BUILD_METALIBS \ + -DCOMPOSITE_SOURCE_EXCLUSIONS="$COMPOSITE_SOURCE_EXCLUSIONS" \ -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT .. fi - make -j4