Browse Source

travis: Fix `COMPOSITE_SOURCE_EXCLUSIONS` being passed to CMake

Sam Edwards 7 years ago
parent
commit
5c166e6cdc
1 changed files with 3 additions and 1 deletions
  1. 3 1
      .travis.yml

+ 3 - 1
.travis.yml

@@ -18,7 +18,7 @@ matrix:
       env: BUILD_METALIBS=ON COMPOSITE_SOURCE_LIMIT=0
       env: BUILD_METALIBS=ON COMPOSITE_SOURCE_LIMIT=0
   include:
   include:
     - os: osx
     - 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
     - compiler: gcc
 
 
 addons:
 addons:
@@ -91,10 +91,12 @@ script:
     fi
     fi
 
 
     cmake -DBUILD_METALIBS=$BUILD_METALIBS \
     cmake -DBUILD_METALIBS=$BUILD_METALIBS \
+    -DCOMPOSITE_SOURCE_EXCLUSIONS="$COMPOSITE_SOURCE_EXCLUSIONS" \
     -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \
     -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \
     -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $PY2_CMAKE_ARGS ..
     -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $PY2_CMAKE_ARGS ..
   else
   else
     cmake -DHAVE_GTK2=NO -DBUILD_METALIBS=$BUILD_METALIBS \
     cmake -DHAVE_GTK2=NO -DBUILD_METALIBS=$BUILD_METALIBS \
+    -DCOMPOSITE_SOURCE_EXCLUSIONS="$COMPOSITE_SOURCE_EXCLUSIONS" \
     -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT ..
     -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT ..
   fi
   fi
 - make -j4
 - make -j4