From 44ec01fa2e8d8da2dce4950ea3d822fe7c8cd8d5 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Mon, 23 Oct 2017 15:00:57 +0100
Subject: minor cleanup

---
 src/Python/CMakeLists.txt | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/Python/CMakeLists.txt b/src/Python/CMakeLists.txt
index e539eda..fd74ee7 100644
--- a/src/Python/CMakeLists.txt
+++ b/src/Python/CMakeLists.txt
@@ -12,18 +12,11 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-message("CIL VERSION " ${CIL_VERSION})
-
-
 # variables that must be set for conda compilation
 
 #PREFIX=C:\Apps\Miniconda2\envs\cil\Library
 #LIBRARY_INC=C:\\Apps\\Miniconda2\\envs\\cil\\Library\\include
 set (NUMPY_VERSION 1.12)
-#set (PYTHON_VERSION 3.5)
-
-#https://groups.google.com/a/continuum.io/forum/#!topic/anaconda/R9gWjl09UFs
-#set (CONDA_ENVIRONMENT "cil")
 
 ## Tries to parse the output of conda env list to determine the current
 ## active conda environment
@@ -50,27 +43,23 @@ execute_process(COMMAND "conda" "env" "list"
 				  endif()
 				endforeach()
 			else()
-				message("conda result false" ${_CONDA_ERR})
+				message(FATAL_ERROR "conda error " ${_CONDA_ERR})
 			endif()
 
-if (${CONDA_ENVIRONMENT} AND ${CONDA_ENVIRONMENT_PATH})
-  message (FATAL_ERROR "CONDA NOT FOUND")
-else()
-  message("**********************************************************")
-  message("Using current conda environmnet " ${CONDA_ENVIRONMENT})
-  message("Using current conda environmnet path" ${CONDA_ENVIRONMENT_PATH})
-endif()
-
-
+message("**********************************************************")
+message("Using current conda environmnet " ${CONDA_ENVIRONMENT})
+message("Using current conda environmnet path" ${CONDA_ENVIRONMENT_PATH})
 
 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})
 message("Python found Major " ${PYTHON_VERSION_MAJOR})
 message("Python found Minor " ${PYTHON_VERSION_MINOR})
+
 findPythonPackagesPath()
 message("PYTHON_PACKAGES_FOUND " ${PYTHON_PACKAGES_PATH})
 
@@ -105,6 +94,7 @@ elseif(UNIX)
 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/compile.sh.in ${CMAKE_CURRENT_BINARY_DIR}/compile.sh)
 endif()
 
+
 ### add tests
 
 #add_executable(RegularizersTest )
-- 
cgit v1.2.3