prefer python3 for matchcompiler in build

firewave · firewave · commit 0a7a1debbf33 · 2022-02-11T16:53:48.000+01:00
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
@@ -34,10 +34,14 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 if (NOT USE_MATCHCOMPILER_OPT MATCHES "Off")
-    find_package(PythonInterp)
-    if (NOT ${PYTHONINTERP_FOUND})
-        message(WARNING "No python interpreter found. Therefore, the match compiler is switched off.")
-        set(USE_MATCHCOMPILER_OPT "Off")
+    find_package(PythonInterp 3 QUIET)
+    if (NOT PYTHONINTERP_FOUND)
+        set(PYTHONINTERP_FOUND "")
+        find_package(PythonInterp 2.7 QUIET)
+        if (NOT PYTHONINTERP_FOUND)
+            message(WARNING "No python interpreter found. Therefore, the match compiler is switched off.")
+            set(USE_MATCHCOMPILER_OPT "Off")
+        endif()
     endif()
 endif()
 
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
@@ -47,6 +47,11 @@ if (HAVE_RULES)
     message( STATUS "PCRE_LIBRARY =          ${PCRE_LIBRARY}" )
 endif()
 message( STATUS )
+if (NOT USE_MATCHCOMPILER_OPT MATCHES "Off")
+    message( STATUS "PYTHON_VERSION_STRING = ${PYTHON_VERSION_STRING}" )
+    message( STATUS "PYTHON_EXECUTABLE =     ${PYTHON_EXECUTABLE}" )
+endif()
+message( STATUS )
 message( STATUS "USE_Z3 =                ${USE_Z3}" )
 if (USE_Z3)
     message( STATUS "Z3_LIBRARIES =          ${Z3_LIBRARIES}" )
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
@@ -254,9 +254,9 @@ int main(int argc, char **argv)
          << "endif\n";
     fout << "ifeq ($(MATCHCOMPILER),yes)\n"
          << "    # Find available Python interpreter\n"
-         << "    PYTHON_INTERPRETER := $(shell which python)\n"
+         << "    PYTHON_INTERPRETER := $(shell which python3)\n"
          << "    ifndef PYTHON_INTERPRETER\n"
-         << "        PYTHON_INTERPRETER := $(shell which python3)\n"
+         << "        PYTHON_INTERPRETER := $(shell which python)\n"
          << "    endif\n"
          << "    ifndef PYTHON_INTERPRETER\n"
          << "        $(error Did not find a Python interpreter)\n"
