Commit 06fe75fb authored by peastman's avatar peastman
Browse files

Attempt at fixing errors on travis and appveyor

parent 31d7f883
...@@ -108,6 +108,11 @@ before_install: ...@@ -108,6 +108,11 @@ before_install:
brew install doxygen fftw; brew install doxygen fftw;
sudo easy_install pytest; sudo easy_install pytest;
fi fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
export PATH=${DEPS_DIR}/cmake/bin:${PATH}
fi
- if [[ "$OPENCL" == "true" ]]; then - if [[ "$OPENCL" == "true" ]]; then
wget http://s3.amazonaws.com/omnia-ci/AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2; wget http://s3.amazonaws.com/omnia-ci/AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2;
tar -xjf AMD-APP-SDK*.tar.bz2; tar -xjf AMD-APP-SDK*.tar.bz2;
......
os: Windows Server 2012 R2 os: Visual Studio 2015
shallow_clone: true shallow_clone: true
install: install:
# Setup shell for VS2010, x64, release mode # Setup shell for VS2015, x64, release mode
- > - >
"%ProgramFiles%\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release "%ProgramFiles%\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
# Set path to python, git-bash tools. # Set path to python, git-bash tools.
......
...@@ -404,7 +404,7 @@ version of Visual Studio. ...@@ -404,7 +404,7 @@ version of Visual Studio.
Install CMake Install CMake
============= =============
CMake is the build system used for OpenMM. You must install CMake version 2.8 CMake is the build system used for OpenMM. You must install CMake version 3.1
or higher before attempting to build OpenMM from source. You can get CMake from or higher before attempting to build OpenMM from source. You can get CMake from
http://www.cmake.org/. If you choose to build CMake from source on Linux, make http://www.cmake.org/. If you choose to build CMake from source on Linux, make
sure you have the curses library installed beforehand, so that you will be able sure you have the curses library installed beforehand, so that you will be able
...@@ -509,7 +509,7 @@ Windows ...@@ -509,7 +509,7 @@ Windows
On Windows, perform the following steps: On Windows, perform the following steps:
#. Click Start->All Programs->CMake 2.8->CMake #. Click Start->All Programs->CMake 3.1->CMake
#. In the box labeled "Where is the source code:" browse to OpenMM src directory #. In the box labeled "Where is the source code:" browse to OpenMM src directory
(containing top CMakeLists.txt) (containing top CMakeLists.txt)
#. In the box labeled "Where to build the binaries" browse to your build_openmm #. In the box labeled "Where to build the binaries" browse to your build_openmm
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment