diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-20 16:58:35 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-20 16:58:35 +0100 |
| commit | 966bc0b109a27b69033b16f0b98fbd25056f2f90 (patch) | |
| tree | 2a84087c2986baa820197eb1e71934a3207ec08b | |
| parent | 8b427d82acfaeb4671484bc459343c5e2e412736 (diff) | |
| parent | b6c314b371ef3081828fa007cd3fcaf1dc820477 (diff) | |
| download | regularization-966bc0b109a27b69033b16f0b98fbd25056f2f90.tar.gz regularization-966bc0b109a27b69033b16f0b98fbd25056f2f90.tar.bz2 regularization-966bc0b109a27b69033b16f0b98fbd25056f2f90.tar.xz regularization-966bc0b109a27b69033b16f0b98fbd25056f2f90.zip | |
Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Python/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c9e8cb7..d05cdd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,4 +27,4 @@ set (CIL_VERSION_PATCH 1) set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}') -add_subdirectory(src)
\ No newline at end of file +add_subdirectory(src) diff --git a/src/Python/CMakeLists.txt b/src/Python/CMakeLists.txt index fd377cc..3eb4158 100644 --- a/src/Python/CMakeLists.txt +++ b/src/Python/CMakeLists.txt @@ -15,6 +15,7 @@ message("CIL VERSION " ${CIL_VERSION}) # variables that are set by conda + #PREFIX=C:\Apps\Miniconda2\envs\cil\Library #LIBRARY_INC=C:\\Apps\\Miniconda2\\envs\\cil\\Library\\include |