diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-08-01 12:18:21 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-12-11 11:53:33 +0100 |
| commit | d5b56ebb1534a3359f03534a967bbe3cf2a5eb51 (patch) | |
| tree | 556970cbfdb5e509b58fd89aba86e078325311a8 /build_scripts/main.py | |
| parent | fd5916f44c052f21d6e86570f37dd92d1bbaa203 (diff) | |
Shiboken: Remove FindPythonInterp and FindPythonLibs CMake modules
- They were deprecated since 3.12 and removed in 3.27
- Use FindPython module as replacement
- all the Python cmake variables resulted are renamed to their
respective variable names as per the FindPython module instead of
FindPythonInterp or FindPythonLibs module
Pick-to: 6.6
Fixes: PYSIDE-2439
Change-Id: I1d3106e2cc9ee97e2d4f62d4e19e1a591d1021ad
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 27270e71d..cd5be7bd3 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -611,9 +611,9 @@ class PysideBuild(_build, CommandMixin, BuildInfoCollectorMixin): # embedding_generator.py. Pass it as a separate option. cmake_cmd.append(f"-DQFP_PYTHON_HOST_PATH={sys.executable}") else: - cmake_cmd.append(f"-DPYTHON_EXECUTABLE={self.py_executable}") - cmake_cmd.append(f"-DPYTHON_INCLUDE_DIR={self.py_include_dir}") - cmake_cmd.append(f"-DPYTHON_LIBRARY={self.py_library}") + cmake_cmd.append(f"-DPython_EXECUTABLE={self.py_executable}") + cmake_cmd.append(f"-DPython_INCLUDE_DIR={self.py_include_dir}") + cmake_cmd.append(f"-DPython_LIBRARY={self.py_library}") # If a custom shiboken cmake config directory path was provided, pass it to CMake. if OPTION["SHIBOKEN_CONFIG_DIR"] and config.is_internal_pyside_build(): |