From a18543d73203b6175a9a3531486f31ee62bcf42e Mon Sep 17 00:00:00 2001 From: Nyan Pasu Date: Tue, 5 Oct 2021 12:25:02 +0000 Subject: Fix ECM on systems without PyQt5 on Python 2 --- find-modules/FindPythonModuleGeneration.cmake | 2 +- find-modules/sip_generator.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake index 6104c1f4..0640b09a 100644 --- a/find-modules/FindPythonModuleGeneration.cmake +++ b/find-modules/FindPythonModuleGeneration.cmake @@ -260,7 +260,7 @@ else() message(STATUS "Found ${libclang_LIBRARY}") endif() -foreach (pyversion "2" "3") +foreach (pyversion "3" "2") set(GPB_PYTHON_COMMAND ${GPB_PYTHON${pyversion}_COMMAND}) if (NOT GPB_PYTHON_COMMAND) continue() diff --git a/find-modules/sip_generator.py b/find-modules/sip_generator.py index 548d798b..e6627ae3 100644 --- a/find-modules/sip_generator.py +++ b/find-modules/sip_generator.py @@ -792,4 +792,5 @@ if __name__ == "__main__": if sys.argv[1] != "--self-check": sys.exit(main()) else: + from PyQt5.Qt import PYQT_CONFIGURATION cindex.Config.set_library_file(sys.argv[2]) -- cgit v1.2.1