|
24 | 24 | pyDir = f"C:/hostedtoolcache/windows/Python/{pythonversion}/{arch}" |
25 | 25 | pyPath = f"{pyDir}/python.exe" |
26 | 26 | Qtinstallpath = f"D:/a/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir}" |
| 27 | + qmake = f"{Qtinstallpath}/bin/qmake.exe" |
27 | 28 | elif sys.platform == "linux": |
28 | 29 | pyPathEx = f"/opt/hostedtoolcache/Python/3.12.10/x64/bin/python" |
29 | 30 | pyDir = f"/opt/hostedtoolcache/Python/{pythonversion}/{arch}/bin/python" |
30 | 31 | pyPath = f"{pyDir}/python.exe" |
31 | 32 | Qtinstallpath = f"/home/runner/work/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir}" |
| 33 | + qmake = f"{Qtinstallpath}/bin/qmake" |
32 | 34 |
|
33 | 35 | subprocess.run(f"{pyPath} -m pip install --upgrade pip") |
34 | 36 | if binding.lower().startswith("pyqt"): |
@@ -85,10 +87,6 @@ def __parsefile(fn, cb): |
85 | 87 | subprocess.run(f'python gen_widgets.py {int(qtversion.startswith("5"))}') |
86 | 88 | subprocess.run(f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}') |
87 | 89 | subprocess.run(f"{pyPath} sip_code_fix.py") |
88 | | - if sys.platform == "win32": |
89 | | - qmake = f"{Qtinstallpath}/bin/qmake.exe" |
90 | | - else: |
91 | | - qmake = f"{Qtinstallpath}/bin/qmake" |
92 | 90 |
|
93 | 91 | subprocess.run( |
94 | 92 | rf"{pyDir}/Scripts/sip-build --verbose --qmake {qmake}" |
@@ -123,7 +121,7 @@ def __parsefile(fn, cb): |
123 | 121 | ) |
124 | 122 |
|
125 | 123 | subprocess.run( |
126 | | - f'cmake -DMY_QT_INSTALL={Qtinstallpath} -DMY_PYTHON_INSTALL_PATH={pyDir.replace("\\", "/")} -DELA_LIB_PATH={os.path.abspath("../ElaWidgetTools/Release/ElaWidgetTools.lib").replace("\\", "/")} -DELA_INCLUDE_PATH={os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} ./CMakeLists.txt {flags}' |
| 124 | + f'cmake -DMY_QT_INSTALL={Qtinstallpath} -DMY_PYTHON_INSTALL_PATH={pyDir} -DELA_LIB_PATH={os.path.abspath("../ElaWidgetTools/Release/ElaWidgetTools.lib").replace("\\", "/")} -DELA_INCLUDE_PATH={os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} ./CMakeLists.txt {flags}' |
127 | 125 | ) |
128 | 126 | subprocess.run( |
129 | 127 | f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}" |
|
0 commit comments