diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-19 14:33:42 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-19 14:33:42 +0000 |
| commit | 113762f1086a5e202f81b35e624da3d28402d70e (patch) | |
| tree | 01a607ac92caff6b0c2475ff515536cdac893984 | |
| parent | d8da92d590fcab561b9e65ee57851e2e402f0cd4 (diff) | |
| parent | ffe5f08c6f161485ab59496e54a8a44bc8986361 (diff) | |
| download | regularization-113762f1086a5e202f81b35e624da3d28402d70e.tar.gz regularization-113762f1086a5e202f81b35e624da3d28402d70e.tar.bz2 regularization-113762f1086a5e202f81b35e624da3d28402d70e.tar.xz regularization-113762f1086a5e202f81b35e624da3d28402d70e.zip | |
Merge branch 'pythonize'
Resolved Conflicts:
Core/recipe/meta.yaml
Wrappers/Python/CMakeLists.txt
| -rw-r--r-- | Core/recipe/meta.yaml | 24 | ||||
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 16 |
2 files changed, 33 insertions, 7 deletions
diff --git a/Core/recipe/meta.yaml b/Core/recipe/meta.yaml index 1fca6bf..fbce22b 100644 --- a/Core/recipe/meta.yaml +++ b/Core/recipe/meta.yaml @@ -1,5 +1,5 @@ package: - name: regularizer + name: cil_regularizer version: {{ environ['CIL_VERSION'] }} source: @@ -10,11 +10,25 @@ build: script_env: - CIL_VERSION -requirements: +requirements: build: - - toolchain - - cmake - - ninja + - boost == 1.64.0 + - boost-cpp == 1.64.0 +# - toolchain + - python 3.5 + - cmake >=3.1 +# - zlib 1.2.11 + - vc 14 # [win and py35] + - libtiff + - numpy + + run: + - boost ==1.64.0 + - libtiff + - vc 14 # [win and py35] + - python 3.5 + - numpy + about: home: http://www.ccpi.ac.uk diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index 506159a..92baf2c 100644 --- a/Wrappers/Python/CMakeLists.txt +++ b/Wrappers/Python/CMakeLists.txt @@ -13,6 +13,20 @@ # limitations under the License. # variables that must be set for conda compilation +cmake_minimum_required (VERSION 3.0) + +project(FISTA) +#https://stackoverflow.com/questions/13298504/using-cmake-with-setup-py + +# The version number. +set (FISTA_VERSION_MAJOR 1) +set (FISTA_VERSION_MINOR 0) + +set (CIL_VERSION_MAJOR 0) +set (CIL_VERSION_MINOR 9) +set (CIL_VERSION_PATCH 1) + +set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}' CACHE INTERNAL "Core Imaging Library version" FORCE) #PREFIX=C:\Apps\Miniconda2\envs\cil\Library #LIBRARY_INC=C:\\Apps\\Miniconda2\\envs\\cil\\Library\\include @@ -51,8 +65,6 @@ endif() message("CIL VERSION " ${CIL_VERSION}) -# set the Python variables for the Conda environment -include(FindAnacondaEnvironment.cmake) findPythonForAnacondaEnvironment(${CONDA_ENVIRONMENT_PATH}) message("Python found " ${PYTHON_VERSION_STRING}) |