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 /sources/shiboken6/data/Shiboken6Config-spec.cmake.in | |
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 'sources/shiboken6/data/Shiboken6Config-spec.cmake.in')
-rw-r--r-- | sources/shiboken6/data/Shiboken6Config-spec.cmake.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/shiboken6/data/Shiboken6Config-spec.cmake.in b/sources/shiboken6/data/Shiboken6Config-spec.cmake.in index a07563a53..233404bc6 100644 --- a/sources/shiboken6/data/Shiboken6Config-spec.cmake.in +++ b/sources/shiboken6/data/Shiboken6Config-spec.cmake.in @@ -5,9 +5,9 @@ # This is the version of Python against which Shiboken was built. Not necessarily the version # against which a downstream project is built (e.g. PySide6). -set(SHIBOKEN_PYTHON_VERSION_MAJOR "@PYTHON_VERSION_MAJOR@") -set(SHIBOKEN_PYTHON_VERSION_MINOR "@PYTHON_VERSION_MINOR@") -set(SHIBOKEN_PYTHON_VERSION_PATCH "@PYTHON_VERSION_PATCH@") +set(SHIBOKEN_PYTHON_VERSION_MAJOR "@Python_VERSION_MAJOR@") +set(SHIBOKEN_PYTHON_VERSION_MINOR "@Python_VERSION_MINOR@") +set(SHIBOKEN_PYTHON_VERSION_PATCH "@Python_VERSION_PATCH@") set(SHIBOKEN_PYTHON_LIMITED_API "@PYTHON_LIMITED_API@") # Import targets and call variable set up functions only when using an installed shiboken config @@ -17,7 +17,7 @@ if (NOT TARGET Shiboken6::libshiboken) include("${CMAKE_CURRENT_LIST_DIR}/ShibokenHelpers.cmake") # Compute the python include and libraries path if needed (aka not part of super project build). - shiboken_find_required_python(@PYTHON_VERSION_MAJOR@) + shiboken_find_required_python(@Python_VERSION_MAJOR@) shiboken_check_if_built_and_target_python_are_compatible() shiboken_check_if_limited_api() shiboken_compute_python_includes(IS_CALLED_FROM_EXPORT) |