diff --git a/SAS/LSMR/CMakeLists.txt b/SAS/LSMR/CMakeLists.txt index 2b0f10a1ae3f42a6da72cca067b4c325a8cbe725..cc801df9532153aaa39dbd8455dc7fefc1eb6bd4 100644 --- a/SAS/LSMR/CMakeLists.txt +++ b/SAS/LSMR/CMakeLists.txt @@ -2,8 +2,6 @@ lofar_package(LSMR 0.1) -include(PythonInstall) - add_subdirectory(src) add_subdirectory(bin) add_subdirectory(test) diff --git a/SAS/LSMR/bin/lsmr b/SAS/LSMR/bin/lsmr index c506ebd2ccf95da6948a925be631ad47b8adf431..070c4c31edb406800d31c900453d42f07f34cedc 100644 --- a/SAS/LSMR/bin/lsmr +++ b/SAS/LSMR/bin/lsmr @@ -39,6 +39,6 @@ done echo "Using port $PORT" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -$DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py migrate -$DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py runserver 0.0.0.0:$PORT +/usr/bin/python3 $DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py migrate +/usr/bin/python3 $DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py runserver 0.0.0.0:$PORT diff --git a/SAS/LSMR/src/CMakeLists.txt b/SAS/LSMR/src/CMakeLists.txt index dd080efb534d1e2d9b22490c09557fc9f906db47..973be9825daa09adda8af1ced8ccd96deb601e26 100644 --- a/SAS/LSMR/src/CMakeLists.txt +++ b/SAS/LSMR/src/CMakeLists.txt @@ -1,4 +1,5 @@ lofar_find_package(PythonInterp 3.4 REQUIRED) +set(USE_PYTHON_COMPILATION Off) include(PythonInstall) include(FindPython3Module) diff --git a/SAS/LSMR/test/CMakeLists.txt b/SAS/LSMR/test/CMakeLists.txt index 2c1768acc345caa2f3fdbaaf2c3d7fd134b1a1e0..576586f8f5fa93a42b422a58b401b85f04bf34a8 100644 --- a/SAS/LSMR/test/CMakeLists.txt +++ b/SAS/LSMR/test/CMakeLists.txt @@ -1,8 +1,9 @@ include(LofarCTest) include(FindPython3Module) +set(USE_PYTHON_COMPILATION Off) find_python3_module(mock REQUIRED) -find_python3_module(requests REQUIRED) # FIXME: Not detected +find_python3_module(requests REQUIRED) lofar_add_test(t_lsmrapp_models) lofar_add_test(t_functional)