diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2019-03-16 13:42:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 13:42:57 +0000 |
| commit | 1740fb91c1842dc174492857fad88c03420f74eb (patch) | |
| tree | 8b591c577fa82fd5da219e118476d4cd86fc5cf9 | |
| parent | 1ac06b5ce11b247930489b7aa3afa59215e43c91 (diff) | |
| parent | 514ba391805517a999db7ef42808b9ae9662b67b (diff) | |
| download | regularization-1740fb91c1842dc174492857fad88c03420f74eb.tar.gz regularization-1740fb91c1842dc174492857fad88c03420f74eb.tar.bz2 regularization-1740fb91c1842dc174492857fad88c03420f74eb.tar.xz regularization-1740fb91c1842dc174492857fad88c03420f74eb.zip | |
Merge branch 'master' into tol
| -rw-r--r-- | recipe/bld.bat | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/recipe/bld.bat b/recipe/bld.bat index 9925a8a..62ae9b9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,19 +3,12 @@ ECHO CIL_VERSION Not Defined. exit 1 ) -mkdir "%SRC_DIR%\ccpi" -ROBOCOPY /E "%RECIPE_DIR%\.." "%SRC_DIR%\ccpi" -ROBOCOPY /E "%RECIPE_DIR%\..\src\Core" "%SRC_DIR%\src\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=ON -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 |