diff options
| author | vagrant <vagrant@localhost.localdomain> | 2019-01-21 16:41:10 +0000 |
|---|---|---|
| committer | vagrant <vagrant@localhost.localdomain> | 2019-01-21 16:41:10 +0000 |
| commit | 5e436eab5cea50569df9c85159be69d8e88688f0 (patch) | |
| tree | ad233a03a25e587f09ebee23fc8ad48a7c2892dd /Wrappers | |
| parent | 204dc742ee5a8fda3f168b3e84632f5cdb75ce2e (diff) | |
| download | regularization-5e436eab5cea50569df9c85159be69d8e88688f0.tar.gz regularization-5e436eab5cea50569df9c85159be69d8e88688f0.tar.bz2 regularization-5e436eab5cea50569df9c85159be69d8e88688f0.tar.xz regularization-5e436eab5cea50569df9c85159be69d8e88688f0.zip | |
UPDATE: propagate CIL_VERSION
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: |