diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2019-03-16 13:40:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 13:40:04 +0000 |
| commit | 514ba391805517a999db7ef42808b9ae9662b67b (patch) | |
| tree | 7ce7a82e967803127e7aab98a58cb7acf517a95e | |
| parent | 7845ff5eb1fd10e9ed02610c40ed80879b8cd62c (diff) | |
| parent | 597373314e9bd7609b25f123f487b799f6c80dd2 (diff) | |
| download | regularization-514ba391805517a999db7ef42808b9ae9662b67b.tar.gz regularization-514ba391805517a999db7ef42808b9ae9662b67b.tar.bz2 regularization-514ba391805517a999db7ef42808b9ae9662b67b.tar.xz regularization-514ba391805517a999db7ef42808b9ae9662b67b.zip | |
Merge pull request #111 from vais-ral/fix_win_test
fix test for windows
| -rw-r--r-- | recipe/bld.bat | 14 | ||||
| -rw-r--r-- | recipe/meta.yaml | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/recipe/bld.bat b/recipe/bld.bat index 6c84355..62ae9b9 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=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..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 |