diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-02-28 16:24:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 16:24:01 +0000 |
| commit | 879c87c5709ee194a8c7a2207f5a21d4a757f723 (patch) | |
| tree | eddf7bc14a998ffabc7e9e01f0cca2ac44b1d88a /recipes/regularisers | |
| parent | 4c728cf72345f7ab7967380cb536529fd9b1403d (diff) | |
| parent | 68e6f3397e8a450854f39a5d514e1f747b9031a4 (diff) | |
| download | regularization-879c87c5709ee194a8c7a2207f5a21d4a757f723.tar.gz regularization-879c87c5709ee194a8c7a2207f5a21d4a757f723.tar.bz2 regularization-879c87c5709ee194a8c7a2207f5a21d4a757f723.tar.xz regularization-879c87c5709ee194a8c7a2207f5a21d4a757f723.zip | |
Merge pull request #104 from vais-ral/newdirstructure
New directory structure, Merged other changes. The build script checks old and new structure.
Diffstat (limited to 'recipes/regularisers')
| -rw-r--r-- | recipes/regularisers/bld.bat | 21 | ||||
| -rw-r--r-- | recipes/regularisers/build.sh | 19 | ||||
| -rw-r--r-- | recipes/regularisers/meta.yaml | 27 |
3 files changed, 0 insertions, 67 deletions
diff --git a/recipes/regularisers/bld.bat b/recipes/regularisers/bld.bat deleted file mode 100644 index 43a5286..0000000 --- a/recipes/regularisers/bld.bat +++ /dev/null @@ -1,21 +0,0 @@ -IF NOT DEFINED CIL_VERSION ( -ECHO CIL_VERSION Not Defined. -exit 1 -) - -mkdir "%SRC_DIR%\build" -ROBOCOPY /E "%RECIPE_DIR%\..\..\Core" "%SRC_DIR%\build" -::ROBOCOPY /E "%RECIPE_DIR%\..\..\Wrappers\python\src" "%SRC_DIR%\build\module" -cd "%SRC_DIR%\build" - -echo "we should be in %SRC_DIR%\build" - -cmake -G "NMake Makefiles" "%RECIPE_DIR%\..\..\" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" -DCONDA_BUILD=ON -DBUILD_WRAPPERS=OFF - -::-DBOOST_LIBRARYDIR="%CONDA_PREFIX%\Library\lib" -DBOOST_INCLUDEDIR="%CONDA_PREFIX%\Library\include" -DBOOST_ROOT="%CONDA_PREFIX%\Library\lib" - -:: Build C library -nmake install -if errorlevel 1 exit 1 - -:: Install step diff --git a/recipes/regularisers/build.sh b/recipes/regularisers/build.sh deleted file mode 100644 index eaa778e..0000000 --- a/recipes/regularisers/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -echo build.sh CIL_VERSION: $CIL_VERSION -#if [ -z "$CIL_VERSION" ]; then -# echo "Need to set CIL_VERSION" -# exit 1 -#fi -#export CIL_VERSION=0.9.1 - - - -mkdir ${SRC_DIR}/build -cp -rv ${RECIPE_DIR}/../../Core/ ${SRC_DIR}/build -mkdir ${SRC_DIR}/build/build -cd ${SRC_DIR}/build/build -cmake -G "Unix Makefiles" -DLIBRARY_LIB="${CONDA_PREFIX}/lib" -DLIBRARY_INC="${CONDA_PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" ../Core - -make -j2 VERBOSE=1 -make install diff --git a/recipes/regularisers/meta.yaml b/recipes/regularisers/meta.yaml deleted file mode 100644 index 3ffcd1d..0000000 --- a/recipes/regularisers/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -package: - name: cil_regulariser - version: {{ environ['CIL_VERSION'] }} - - -build: - preserve_egg_dir: False - script_env: - - CIL_VERSION - -requirements: - build: - - cmake >=3.1 - - vc 14 # [win and py36] - - vc 14 # [win and py35] - - vc 9 # [win and py27] - - run: - - vc 14 # [win and py36] - - vc 14 # [win and py35] - - vc 9 # [win and py27] - - -about: - home: http://www.ccpi.ac.uk - license: Apache v2.0 - summary: Regulariser package from CCPi |