From: Kornel Benko <kornel@lyx.org>
Date: Thu, 28 Nov 2019 20:51:47 +0000 (+0100)
Subject: Cmake build: Consider for cmake versions <= 3.12 while searching for python
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e90150a5fe7658d2fd7dcfadf593d6b05a2326ef;p=features.git

Cmake build: Consider for cmake versions <= 3.12 while searching for python

This partially reverts d17dfe6f
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52290e8e36..12b81a6d63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -792,16 +792,27 @@ unset(LYX_PYTHON_EXECUTABLE CACHE)
 unset(PYTHON_VERSION_MAJOR)
 unset(PYTHON_VERSION_MINOR)
 unset(PYTHON_VERSION_STRING)
-find_package(Python3 3.5 QUIET)
-if(NOT Python3_Interpreter_FOUND)
-  unset(PYTHON_EXECUTABLE CACHE)
-  find_package(Python2 2.0 REQUIRED)
-  if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
-    message(FATAL_ERROR "Python interpreter found, but is not suitable")
+if (CMAKE_VERSION VERSION_LESS "3.13")
+  find_package(PythonInterp 3.5 QUIET)
+  if(NOT PYTHONINTERP_FOUND)
+    find_package(PythonInterp 2.0 REQUIRED)
+    if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
+      message(FATAL_ERROR "Python interpreter found, but is not suitable")
+    endif()
   endif()
-  set(LYX_PYTHON_EXECUTABLE ${Python2_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+  set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
 else()
-  set(LYX_PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+  find_package(Python3 3.5 QUIET)
+  if(NOT Python3_Interpreter_FOUND)
+    unset(PYTHON_EXECUTABLE CACHE)
+    find_package(Python2 2.0 REQUIRED)
+    if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
+      message(FATAL_ERROR "Python interpreter found, but is not suitable")
+    endif()
+    set(LYX_PYTHON_EXECUTABLE ${Python2_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+  else()
+    set(LYX_PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+  endif()
 endif()
 
 if(LYX_NLS)