summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvagrant <vagrant@localhost.localdomain>2019-01-21 16:41:25 +0000
committervagrant <vagrant@localhost.localdomain>2019-01-21 16:41:25 +0000
commitd0052abf619d327e18791aeefd1b0a0a513c546b (patch)
treee30e86ebd29a6a1e0bac1df48751fe445b361865
parent5e436eab5cea50569df9c85159be69d8e88688f0 (diff)
downloadregularization-d0052abf619d327e18791aeefd1b0a0a513c546b.tar.gz
regularization-d0052abf619d327e18791aeefd1b0a0a513c546b.tar.bz2
regularization-d0052abf619d327e18791aeefd1b0a0a513c546b.tar.xz
regularization-d0052abf619d327e18791aeefd1b0a0a513c546b.zip
UPDATE: build
-rw-r--r--recipes/regularisers/bld.bat2
-rw-r--r--recipes/regularisers/build.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/regularisers/bld.bat b/recipes/regularisers/bld.bat
index 63e7681..43a5286 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%\..\..\" -DCIL_VERSION="%CIL_VERSION%" -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%\..\..\" -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 aede303..eaa778e 100644
--- a/recipes/regularisers/build.sh
+++ b/recipes/regularisers/build.sh
@@ -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" -DCIL_VERSION="${CIL_VERSION}" -DLIBRARY_LIB="${CONDA_PREFIX}/lib" -DLIBRARY_INC="${CONDA_PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" ../Core
+cmake -G "Unix Makefiles" -DLIBRARY_LIB="${CONDA_PREFIX}/lib" -DLIBRARY_INC="${CONDA_PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" ../Core
make -j2 VERBOSE=1
make install