TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

travis: Fix COMPOSITE_SOURCE_EXCLUSIONS being passed to CMake

Browse Source
This commit is contained in:
Sam Edwards 2018-10-17 17:44:31 -06:00
parent 2c0b079dc9
commit 5c166e6cdc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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