summaryrefslogtreecommitdiffstats
path: root/recipe
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2019-03-15 16:53:17 +0000
committerEdoardo Pasca <edo.paskino@gmail.com>2019-03-15 16:53:17 +0000
commit2ffd8caa4b5a6ddfe517e91c9ceae8fc8568127c (patch)
tree9695b8e3d1fe93727a653e261ec19dcddef4ebdb /recipe
parent7845ff5eb1fd10e9ed02610c40ed80879b8cd62c (diff)
downloadregularization-2ffd8caa4b5a6ddfe517e91c9ceae8fc8568127c.tar.gz
regularization-2ffd8caa4b5a6ddfe517e91c9ceae8fc8568127c.tar.bz2
regularization-2ffd8caa4b5a6ddfe517e91c9ceae8fc8568127c.tar.xz
regularization-2ffd8caa4b5a6ddfe517e91c9ceae8fc8568127c.zip
fix test for windows
Diffstat (limited to 'recipe')
-rw-r--r--recipe/bld.bat12
-rw-r--r--recipe/meta.yaml2
2 files changed, 4 insertions, 10 deletions
diff --git a/recipe/bld.bat b/recipe/bld.bat
index 6c84355..8f497d0 100644
--- a/recipe/bld.bat
+++ b/recipe/bld.bat
@@ -3,18 +3,12 @@ ECHO CIL_VERSION Not Defined.
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
+mkdir "%SRC_DIR%\test"
+ROBOCOPY /E "%RECIPE_DIR%\..\test" "%SRC_DIR%\test"
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=OFF -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
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 6ff4e31..111cd68 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -35,7 +35,7 @@ requirements:
- 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