diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-23 17:21:07 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-23 22:45:21 +0000 |
| commit | 8935451cc1449570b485cd244ca564a17b80bfa2 (patch) | |
| tree | 19e806b3e56f7a8592a1f7112ccbe918b52ae8b8 | |
| parent | cc4977b8f294613126428375cd151597008944d9 (diff) | |
| download | regularization-8935451cc1449570b485cd244ca564a17b80bfa2.tar.gz regularization-8935451cc1449570b485cd244ca564a17b80bfa2.tar.bz2 regularization-8935451cc1449570b485cd244ca564a17b80bfa2.tar.xz regularization-8935451cc1449570b485cd244ca564a17b80bfa2.zip | |
fixed conda recipes for unix
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 5 | ||||
| -rw-r--r-- | recipes/regularizers/build.sh | 28 |
2 files changed, 19 insertions, 14 deletions
diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index 855047f..aaf9a69 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -4,10 +4,13 @@ if [ -z "$CIL_VERSION" ]; then exit 1 fi mkdir "$SRC_DIR/ccpi" -cp -r "$RECIPE_DIR/../.." "$SRC_DIR/ccpi" +cp -rv "$RECIPE_DIR/../.." "$SRC_DIR/ccpi" +cp -rv "$RECIPE_DIR/../../../Core" "$SRC_DIR/Core" cd $SRC_DIR/ccpi/Python +echo "$SRC_DIR/ccpi/Python" + $PYTHON setup.py build_ext $PYTHON setup.py install diff --git a/recipes/regularizers/build.sh b/recipes/regularizers/build.sh index ab5474b..0b8bce2 100644 --- a/recipes/regularizers/build.sh +++ b/recipes/regularizers/build.sh @@ -1,17 +1,19 @@ #!/usr/bin/env bash -mkdir build -cd build +echo $CIL_VERSION +#if [ -z "$CIL_VERSION" ]; then +# echo "Need to set CIL_VERSION" +# exit 1 +#fi +#export CIL_VERSION=0.9.1 -#configure -BUILD_CONFIG=Release -echo `pwd` -cmake .. -G "Ninja" \ - -Wno-dev \ - -DCMAKE_BUILD_TYPE=$BUILD_CONFIG \ - -DCMAKE_PREFIX_PATH:PATH="${PREFIX}" \ - -DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \ - -DCMAKE_INSTALL_RPATH:PATH="${PREFIX}/lib" -# compile & install -ninja install + +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 |