diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-08-06 21:38:41 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-08-06 21:38:41 +0100 |
| commit | 44c897e2b13d2b85a8dde028fd80ec3413c80cf4 (patch) | |
| tree | 0513d5a1d227243f5d7eee3831ad085d32cdf38b | |
| parent | 4fa0c5bcd9e362cbdf2211edc85f30ec1dafee3b (diff) | |
| parent | c025620ae1d6f4bfcf823de716336277a2ecb621 (diff) | |
| download | regularization-44c897e2b13d2b85a8dde028fd80ec3413c80cf4.tar.gz regularization-44c897e2b13d2b85a8dde028fd80ec3413c80cf4.tar.bz2 regularization-44c897e2b13d2b85a8dde028fd80ec3413c80cf4.tar.xz regularization-44c897e2b13d2b85a8dde028fd80ec3413c80cf4.zip | |
Merge branch 'cmaking' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into cmaking
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index 2ab8f86..01b5208 100644 --- a/Wrappers/Python/CMakeLists.txt +++ b/Wrappers/Python/CMakeLists.txt @@ -133,4 +133,4 @@ if (PYTHONINTERP_FOUND) add_custom_target(PythonWrapper ALL DEPENDS ${OUTPUT}) #install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install)") -endif()
\ No newline at end of file +endif() diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index 9706301..1247707 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 "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 +cmake -G "Unix Makefiles" $RECIPE_DIR/../../../ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX make install |