diff options
| author | vagrant <vagrant@localhost.localdomain> | 2019-01-21 16:41:10 +0000 |
|---|---|---|
| committer | vagrant <vagrant@localhost.localdomain> | 2019-01-21 16:41:10 +0000 |
| commit | 5e436eab5cea50569df9c85159be69d8e88688f0 (patch) | |
| tree | ad233a03a25e587f09ebee23fc8ad48a7c2892dd /recipes/regularisers | |
| parent | 204dc742ee5a8fda3f168b3e84632f5cdb75ce2e (diff) | |
| download | regularization-5e436eab5cea50569df9c85159be69d8e88688f0.tar.gz regularization-5e436eab5cea50569df9c85159be69d8e88688f0.tar.bz2 regularization-5e436eab5cea50569df9c85159be69d8e88688f0.tar.xz regularization-5e436eab5cea50569df9c85159be69d8e88688f0.zip | |
UPDATE: propagate CIL_VERSION
Diffstat (limited to 'recipes/regularisers')
| -rw-r--r-- | recipes/regularisers/bld.bat | 2 | ||||
| -rw-r--r-- | recipes/regularisers/build.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes/regularisers/bld.bat b/recipes/regularisers/bld.bat index 43a5286..63e7681 100644 --- a/recipes/regularisers/bld.bat +++ b/recipes/regularisers/bld.bat @@ -10,7 +10,7 @@ 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 +cmake -G "NMake Makefiles" "%RECIPE_DIR%\..\..\" -DCIL_VERSION="%CIL_VERSION%" -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" diff --git a/recipes/regularisers/build.sh b/recipes/regularisers/build.sh index 0b8bce2..aede303 100644 --- a/recipes/regularisers/build.sh +++ b/recipes/regularisers/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -echo $CIL_VERSION +echo build.sh CIL_VERSION: $CIL_VERSION #if [ -z "$CIL_VERSION" ]; then # echo "Need to set CIL_VERSION" # exit 1 @@ -13,7 +13,7 @@ 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 +cmake -G "Unix Makefiles" -DCIL_VERSION="${CIL_VERSION}" -DLIBRARY_LIB="${CONDA_PREFIX}/lib" -DLIBRARY_INC="${CONDA_PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" ../Core make -j2 VERBOSE=1 make install |