diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-10 15:07:10 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-10 15:07:10 +0000 |
| commit | 369e6c320889b84ce60a83c54b70e203300a4e1d (patch) | |
| tree | a8977e7202b993f3b7ee55acd4997fa5a3051a89 /Wrappers/Python | |
| parent | 4b74129efead9b8af67f92c3c67a0d9e2b18cdf4 (diff) | |
| download | regularization-369e6c320889b84ce60a83c54b70e203300a4e1d.tar.gz regularization-369e6c320889b84ce60a83c54b70e203300a4e1d.tar.bz2 regularization-369e6c320889b84ce60a83c54b70e203300a4e1d.tar.xz regularization-369e6c320889b84ce60a83c54b70e203300a4e1d.zip | |
changes with cmake steering conda
Diffstat (limited to 'Wrappers/Python')
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index 506159a..e9f190c 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,7 @@ 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}) |