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 /Wrappers/Python | |
| 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
Diffstat (limited to 'Wrappers/Python')
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 16 |
1 files changed, 14 insertions, 2 deletions
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}) |