diff options
author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-08-04 23:06:25 +0100 |
---|---|---|
committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-08-04 23:06:25 +0100 |
commit | bd874abcebae787ea1f1fddc138fb67a8abf9c9b (patch) | |
tree | 4a9ba4bb2ae350c7fc30178930d34901e08cbc6d /Wrappers/Python/conda-recipe | |
parent | ae957063126a421ee0892eff18c44cf8b4e99042 (diff) | |
download | regularization-bd874abcebae787ea1f1fddc138fb67a8abf9c9b.tar.gz regularization-bd874abcebae787ea1f1fddc138fb67a8abf9c9b.tar.bz2 regularization-bd874abcebae787ea1f1fddc138fb67a8abf9c9b.tar.xz regularization-bd874abcebae787ea1f1fddc138fb67a8abf9c9b.zip |
working CMake project for Win and conda/no-conda
Diffstat (limited to 'Wrappers/Python/conda-recipe')
-rw-r--r-- | Wrappers/Python/conda-recipe/bld.bat | 15 | ||||
-rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Wrappers/Python/conda-recipe/bld.bat b/Wrappers/Python/conda-recipe/bld.bat index e47f8d9..e58808b 100644 --- a/Wrappers/Python/conda-recipe/bld.bat +++ b/Wrappers/Python/conda-recipe/bld.bat @@ -6,12 +6,15 @@ exit 1 mkdir "%SRC_DIR%\ccpi" ROBOCOPY /E "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi" ROBOCOPY /E "%RECIPE_DIR%\..\..\..\Core" "%SRC_DIR%\Core" -cd %SRC_DIR%\ccpi\Python +::cd %SRC_DIR%\ccpi\Python +cd %SRC_DIR% :: issue cmake to create setup.py -cmake . +cmake -G "NMake Makefiles" %RECIPE_DIR%\..\..\..\ -DBUILD_WRAPPERS=ON -DCONDA_BUILD=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 +::%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 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index ca28bae..115fcf5 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -21,7 +21,7 @@ requirements: - numpy x.x - setuptools - cython - - cil_regulariser =={{ environ['CIL_VERSION'] }} + # - cil_regulariser =={{ environ['CIL_VERSION'] }} - vc 14 # [win and py36] - vc 14 # [win and py35] - vc 9 # [win and py27] @@ -30,7 +30,7 @@ requirements: run: - python - numpy x.x - - cil_regulariser =={{ environ['CIL_VERSION'] }} + # - cil_regulariser =={{ environ['CIL_VERSION'] }} - vc 14 # [win and py36] - vc 14 # [win and py35] - vc 9 # [win and py27] |