From 75a9002f2c3eadbb5a09546e92e9c5d9556496af Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 12 Feb 2020 11:26:47 +0100 Subject: [PATCH] WIP --- .travis.yml | 2 -- conda-recepie/build.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a432e7208..3e8560e2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ env: dist: trusty install: - - export PYTHON_VERSION=$CONDA_PY - - echo $PYTHON_VERSION - sudo apt-get update - ldd --version - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; diff --git a/conda-recepie/build.sh b/conda-recepie/build.sh index 4881e7aea..ecd6fed84 100755 --- a/conda-recepie/build.sh +++ b/conda-recepie/build.sh @@ -12,7 +12,7 @@ cmake .. \ -DSLS_USE_RECEIVER=ON \ -DSLS_USE_GUI=ON \ -DSLS_USE_TESTS=ON \ - -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION \ + -DPYTHON_EXECUTABLE=$CONDA_PREFIX/bin/python -DSLS_USE_PYTHON=ON \ -DCMAKE_BUILD_TYPE=Release \ -DSLS_USE_HDF5=OFF\