diff options
author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-08-05 15:59:40 +0100 |
---|---|---|
committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-08-05 15:59:40 +0100 |
commit | 89d9b706aa5f6dfe3724e6bdb628f5c95e7425f6 (patch) | |
tree | f9f9eea139b9375657604bbc57e5392ffbcc64f4 /Wrappers | |
parent | a490e0a75e810591f87c73e41965fad9187f6cd1 (diff) | |
parent | 31fc2679552704c90887025f069264b7d9904f7f (diff) | |
download | regularization-89d9b706aa5f6dfe3724e6bdb628f5c95e7425f6.tar.gz regularization-89d9b706aa5f6dfe3724e6bdb628f5c95e7425f6.tar.bz2 regularization-89d9b706aa5f6dfe3724e6bdb628f5c95e7425f6.tar.xz regularization-89d9b706aa5f6dfe3724e6bdb628f5c95e7425f6.zip |
Merge branch 'cmaking' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into cmaking
Diffstat (limited to 'Wrappers')
-rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index ff6583a..9706301 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -9,7 +9,7 @@ cp -rv "$RECIPE_DIR/../../../Core" "$SRC_DIR/Core" cd $SRC_DIR -cmake -G "NMake Makefiles" $RECIPE_DIR/../../../ -DBUILD_WRAPPERS=ON -DCONDA_BUILD=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX/Library" +cmake -G "Unix Makefiles" $RECIPE_DIR/../../../ -DBUILD_WRAPPERS=ON -DCONDA_BUILD=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX make install |