diff options
| author | Kazantsev <daniil.kazantsev@diamond.ac.uk> | 2019-03-11 12:09:44 +0000 |
|---|---|---|
| committer | Kazantsev <daniil.kazantsev@diamond.ac.uk> | 2019-03-11 12:09:44 +0000 |
| commit | fadb3682233a74ec7ffeb89b46b686483e382228 (patch) | |
| tree | 1c092d13cd4bef16ddfad7264b6acdc7dfdbac96 /recipe | |
| parent | e2208bfc2ed540065bef2e8e12d914d873464da7 (diff) | |
| download | regularization-fadb3682233a74ec7ffeb89b46b686483e382228.tar.gz regularization-fadb3682233a74ec7ffeb89b46b686483e382228.tar.bz2 regularization-fadb3682233a74ec7ffeb89b46b686483e382228.tar.xz regularization-fadb3682233a74ec7ffeb89b46b686483e382228.zip | |
fixes conda build for windows
Diffstat (limited to 'recipe')
| -rw-r--r-- | recipe/bld.bat | 9 | ||||
| -rw-r--r-- | recipe/meta.yaml | 18 |
2 files changed, 14 insertions, 13 deletions
diff --git a/recipe/bld.bat b/recipe/bld.bat index 6c84355..9925a8a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -4,17 +4,18 @@ exit 1 ) mkdir "%SRC_DIR%\ccpi" -ROBOCOPY /E "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi" -ROBOCOPY /E "%RECIPE_DIR%\..\..\..\Core" "%SRC_DIR%\Core" +ROBOCOPY /E "%RECIPE_DIR%\.." "%SRC_DIR%\ccpi" +ROBOCOPY /E "%RECIPE_DIR%\..\src\Core" "%SRC_DIR%\src\Core" ::cd %SRC_DIR%\ccpi\Python cd %SRC_DIR% :: issue cmake to create setup.py -cmake -G "NMake Makefiles" %RECIPE_DIR%\..\..\..\ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" +cmake -G "NMake Makefiles" %RECIPE_DIR%\..\ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" + ::%PYTHON% setup-regularisers.py build_ext ::if errorlevel 1 exit 1 ::%PYTHON% setup-regularisers.py install ::if errorlevel 1 exit 1 nmake install -if errorlevel 1 exit 1
\ No newline at end of file +if errorlevel 1 exit 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6ff4e31..e3d74d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,16 +1,16 @@ package: name: ccpi-regulariser version: {{CIL_VERSION}} - + build: preserve_egg_dir: False number: 0 script_env: - CIL_VERSION - + test: source_files: - - ./test/ + - ./test/ requires: - pillow - pillow=4.1.1 # [win] @@ -23,19 +23,19 @@ requirements: - numpy {{ numpy }} - setuptools - cython - - vc 14 # [win and py36] - - vc 14 # [win and py35] + - vc 14 # [win and py36] + - vc 14 # [win and py35] - vc 9 # [win and py27] - - cmake + - cmake run: - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - - vc 14 # [win and py36] - - vc 14 # [win and py35] + - vc 14 # [win and py36] + - vc 14 # [win and py35] - vc 9 # [win and py27] - - libgcc-ng + - libgcc-ng # [unix] about: home: http://www.ccpi.ac.uk |