X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=.travis.yml;h=e2c712d9eae661327a116269b47ca26fc3e9fc4a;hb=743775baaa9b9374834a7aa886087d0e156c30b7;hp=e3e2d0b0631a619d2a0ef809a172b3b8036661dc;hpb=2f93930ef61ff4ca900ddd1445e33c0694cca94f;p=nlopt.git

diff --git a/.travis.yml b/.travis.yml
index e3e2d0b..e2c712d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,12 @@ matrix:
     - os: linux
       addons:
         apt:
-          sources:
-          - george-edison55-precise-backports
           packages:
           - swig
           - python-dev
           - python-numpy
           - guile-2.0-dev
-          - octave3.2-headers
+          - liboctave-dev
           - cmake
           - g++-mingw-w64-i686
           - gcc-mingw-w64-i686
@@ -21,24 +19,26 @@ matrix:
           - g++-mingw-w64-x86-64
           - gcc-mingw-w64-x86-64
           - binutils-mingw-w64-x86-64
+          - gfortran
+
       script:
+        - pip install mkdocs python-markdown-math --user
+        - PATH=$PATH:~/.local/bin mkdocs build
         - mkdir build && pushd build
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON ..
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DNLOPT_MATLAB=OFF -DNLOPT_FORTRAN=ON ..
         - make install -j2 && ctest -j2 --output-on-failure
         - rm -rf * ~/.local
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DBUILD_PYTHON=OFF -DBUILD_OCTAVE=OFF -DBUILD_GUILE=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-i686-w64-mingw32.cmake ..
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DNLOPT_PYTHON=OFF -DNLOPT_OCTAVE=OFF -DNLOPT_GUILE=OFF -DNLOPT_MATLAB=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-i686-w64-mingw32.cmake ..
         - make install -j2
         - rm -rf * ~/.local
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DBUILD_PYTHON=OFF -DBUILD_OCTAVE=OFF -DBUILD_GUILE=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-x86_64-w64-mingw32.cmake ..
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DNLOPT_PYTHON=OFF -DNLOPT_OCTAVE=OFF -DNLOPT_GUILE=OFF -DNLOPT_MATLAB=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-x86_64-w64-mingw32.cmake ..
         - make install -j2
 
     - os: osx
       install:
-        - brew tap homebrew/science
         - brew update
-        # TODO: install guile once 2.2 is supported in swig
-        - brew install swig octave || echo "nope"
+        - brew install swig octave guile || echo "nope"
       script:
         - mkdir build && pushd build
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DPYTHON_EXECUTABLE=/usr/bin/python ..
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local -DPYTHON_EXECUTABLE=/usr/bin/python -DNLOPT_FORTRAN=ON ..
         - make install && ctest --output-on-failure