diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-11-25 03:02:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 03:02:16 -0800 |
| commit | 3a68fbe656c1984b6cf1b921d29225807d4d4ca0 (patch) | |
| tree | 3ffd25a72f89b320fff78412876e93f234df1832 /.travis.yml | |
| parent | c4b5018ca57213601d0b31139be8c4268a308910 (diff) | |
| parent | 40dd0067af0dcf12c8723220bed29b0bea177dc8 (diff) | |
| download | astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.tar.gz astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.tar.bz2 astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.tar.xz astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.zip | |
Merge pull request #77 from wjp/singleton
Change order of template instantiations
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 58c7e0a..d6f7976 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ env: - CUDA=yes - CUDA=no +matrix: + include: + - env: CUDA=no CLANG=yes + python: "3.5" + before_install: - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; @@ -37,6 +42,7 @@ install: - conda info -a - cd build/linux - ./autogen.sh + - if [ x$CLANG == xyes ]; then export CXX=clang++; export CC=clang; fi - if [ $CUDA == yes ]; then ./configure --prefix=$HOME/astra --with-python --with-cuda --with-install-type=module; else ./configure --prefix=$HOME/astra --with-python --without-cuda --with-install-type=module; fi - make -j 4 - make install |