diff --git a/.travis.yml b/.travis.yml index c663128..f080552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ script: - export CHECK_AGAINST="$CHECK_AGAINST --check-against omnia/label/rc --check-against omnia/label/rccuda${CUDA_SHORT_VERSION}" #- export CHECK_AGAINST="$CHECK_AGAINST --check-against omnia/label/beta --check-against omnia/label/betacuda${CUDA_SHORT_VERSION}" #- export CHECK_AGAISNT="$CHECK_AGAINST --check-against omnia/label/dev --check-against omnia/label/devcuda${CUDA_SHORT_VERSION}" + - export CHECK_AGAINST="" # DEBUG - if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" ]]; then export UPLOAD="$CHECK_AGAINST --upload omnia"; else diff --git a/openmm/build.sh b/openmm/build.sh index a47b39e..d348d0c 100644 --- a/openmm/build.sh +++ b/openmm/build.sh @@ -58,10 +58,13 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then CMAKE_FLAGS+=" -DFFTW_THREADS_LIBRARY=$PREFIX/lib/libfftw3f_threads.dylib" fi +env # DEBUG + # Build in subdirectory and install. mkdir build cd build cmake .. $CMAKE_FLAGS +cat CMakeCache.txt # DEBUG make -j$CPU_COUNT all # PythonInstall uses the gcc/g++ 4.2.1 that anaconda was built with, so we can't add extraneous unrecognized compiler arguments. diff --git a/openmm/meta.yaml b/openmm/meta.yaml index 42b7942..7f4f660 100644 --- a/openmm/meta.yaml +++ b/openmm/meta.yaml @@ -7,7 +7,7 @@ source: git_tag: 689e2bc patches: - - silent-cmake.patch + #- silent-cmake.patch - silent-doxygen.patch - silent-latexpdf.patch