From 9bed43a7d63e62cd0af1fd894e20c5e439c7cb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
 <jkuensem@physik.uni-bielefeld.de>
Date: Tue, 12 Jun 2018 10:06:41 +0000
Subject: [PATCH] Task LSMR-8: attempt to switch to Python 3

---
 SAS/LSMR/CMakeLists.txt      | 1 -
 SAS/LSMR/src/CMakeLists.txt  | 3 ++-
 SAS/LSMR/test/CMakeLists.txt | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SAS/LSMR/CMakeLists.txt b/SAS/LSMR/CMakeLists.txt
index b0cdab7f857..2b0f10a1ae3 100644
--- a/SAS/LSMR/CMakeLists.txt
+++ b/SAS/LSMR/CMakeLists.txt
@@ -2,7 +2,6 @@
 
 lofar_package(LSMR 0.1)
 
-# set(Python_ADDITIONAL_VERSIONS 3.4) # FIXME: Find proper solution to manage Python environments with cmake!
 include(PythonInstall)
 
 add_subdirectory(src)
diff --git a/SAS/LSMR/src/CMakeLists.txt b/SAS/LSMR/src/CMakeLists.txt
index b526c0b82d8..8e2240bac11 100644
--- a/SAS/LSMR/src/CMakeLists.txt
+++ b/SAS/LSMR/src/CMakeLists.txt
@@ -1,10 +1,11 @@
 lofar_find_package(PythonInterp 3.4 REQUIRED)
 include(PythonInstall)
 include(FindPythonModule)
+set(Python_ADDITIONAL_VERSIONS 3.4) # FIXME: Find proper solution to manage Python environments with cmake!
 find_python_module(django REQUIRED)
 find_python_module(rest_framework REQUIRED)     # pip install djangorestframework
 find_python_module(ldap REQUIRED)
-# find_python_module(markdown REQUIRED)      # FIXME: not detected
+find_python_module(markdown REQUIRED)
 # find_python_module(django-filter REQUIRED) # FIXME: not detected
 
 set(_py_files
diff --git a/SAS/LSMR/test/CMakeLists.txt b/SAS/LSMR/test/CMakeLists.txt
index 850bab9695f..2ba73220d92 100644
--- a/SAS/LSMR/test/CMakeLists.txt
+++ b/SAS/LSMR/test/CMakeLists.txt
@@ -1,8 +1,10 @@
 include(LofarCTest)
 include(FindPythonModule)
 
+set(Python_ADDITIONAL_VERSIONS 3.4) # FIXME: Find proper solution to manage Python environments with cmake!
+
 find_python_module(mock REQUIRED)
-find_python_module(requests REQUIRED)
+# find_python_module(requests REQUIRED) # FIXME: Not detected
 
 lofar_add_test(t_lsmrapp_models)
 lofar_add_test(t_functional)
-- 
GitLab