diff options
author | Chris Wilson <chris+github@qwirx.com> | 2016-09-03 00:25:52 +0100 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2016-09-09 20:54:12 +0100 |
commit | 98a6ad72ee819774a398440055abd87bc44e9ba0 (patch) | |
tree | 55a5c7eff8deaab2ab7d44ed0357576aa0687a96 /.travis.yml | |
parent | 11a8c444875d8b7912fa07bdc3854e3adb27aa4e (diff) |
Fix Unix compilation using CMake.
Add platform detection that's compatible with the old buildsystem and its m4
autoconfigury.
Make Travis build and test using CMake as a separate target.
Remove unused function BoxGetTemporaryDirectoryName() to fixes compile using
CMake on Unix.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index dbc1466c..96e8bf26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,13 @@ sudo: false addons: apt: + # We need cmake > 2.8.7 + # https://github.com/travis-ci/travis-ci/issues/4631#issuecomment-191153634 + sources: + - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 packages: + - cmake + - cmake-data - libdb-dev - libreadline-dev - libssl-dev @@ -23,6 +29,8 @@ addons: env: - TEST_TARGET=debug - TEST_TARGET=release + - BUILD=cmake TEST_TARGET=debug + - BUILD=cmake TEST_TARGET=release script: - ./infrastructure/travis-build.sh |