diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-21 17:15:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 17:15:29 +0000 |
| commit | 9f186d5978aa4e528ea071d5de0a74edb71916ad (patch) | |
| tree | 45411dd5255691fd4c8495652323c9293c8fb881 /Wrappers | |
| parent | 34d0b9f85c3bc73416f1dc2bb25ef669b9ff8076 (diff) | |
| parent | 60b4d51ce1cf19be2a3483232448ae227253614c (diff) | |
| download | regularization-9f186d5978aa4e528ea071d5de0a74edb71916ad.tar.gz regularization-9f186d5978aa4e528ea071d5de0a74edb71916ad.tar.bz2 regularization-9f186d5978aa4e528ea071d5de0a74edb71916ad.tar.xz regularization-9f186d5978aa4e528ea071d5de0a74edb71916ad.zip | |
Merge pull request #88 from TomasKulhanek/pr-test
Pr test
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 1 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index d86d0ea..c2ef855 100644 --- a/Wrappers/Python/CMakeLists.txt +++ b/Wrappers/Python/CMakeLists.txt @@ -9,7 +9,7 @@ project(regulariserPython) #set (CIL_VERSION $ENV{CIL_VERSION} CACHE INTERNAL "Core Imaging Library version" FORCE) # conda orchestrated build -message("CIL_VERSION ${CIL_VERSION}") +message("CIL_VERSION: ${CIL_VERSION}") #include (GenerateExportHeader) find_package(PythonInterp REQUIRED) diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index eec7c2f..39c0f2c 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -5,6 +5,7 @@ cp -rv "$RECIPE_DIR/../../../Core" "$SRC_DIR/Core" cd $SRC_DIR ##cuda=off + cmake -G "Unix Makefiles" $RECIPE_DIR/../../../ -DBUILD_PYTHON_WRAPPER=ON -DCONDA_BUILD=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index e3258ff..9fe813d 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -5,6 +5,8 @@ package: build: preserve_egg_dir: False number: 0 + script_env: + - CIL_VERSION test: files: |