From 5408ecf63cfbeb0dbc11393b2c34df9c05b21f70 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 20 Feb 2024 11:35:30 -0500 Subject: [PATCH] Set hints to find the python version we actually want. (#134) The comment in the commit explains the reasoning behind it. Signed-off-by: Chris Lalancette --- cmake/shiboken_helper.cmake | 16 ++++++++++++++++ cmake/sip_helper.cmake | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/cmake/shiboken_helper.cmake b/cmake/shiboken_helper.cmake index d2e03e7..b71d2be 100644 --- a/cmake/shiboken_helper.cmake +++ b/cmake/shiboken_helper.cmake @@ -1,3 +1,19 @@ +# By default, without the settings below, find_package(Python3) will attempt +# to find the newest python version it can, and additionally will find the +# most specific version. For instance, on a system that has +# /usr/bin/python3.10, /usr/bin/python3.11, and /usr/bin/python3, it will find +# /usr/bin/python3.11, even if /usr/bin/python3 points to /usr/bin/python3.10. +# The behavior we want is to prefer the "system" installed version unless the +# user specifically tells us othewise through the Python3_EXECUTABLE hint. +# Setting CMP0094 to NEW means that the search will stop after the first +# python version is found. Setting Python3_FIND_UNVERSIONED_NAMES means that +# the search will prefer /usr/bin/python3 over /usr/bin/python3.11. And that +# latter functionality is only available in CMake 3.20 or later, so we need +# at least that version. +cmake_minimum_required(VERSION 3.20) +cmake_policy(SET CMP0094 NEW) +set(Python3_FIND_UNVERSIONED_NAMES FIRST) + find_package(Python3 REQUIRED COMPONENTS Interpreter Development) if(__PYTHON_QT_BINDING_SHIBOKEN_HELPER_INCLUDED) diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake index edb4c26..a5ac3c2 100644 --- a/cmake/sip_helper.cmake +++ b/cmake/sip_helper.cmake @@ -5,6 +5,22 @@ set(__PYTHON_QT_BINDING_SIP_HELPER_INCLUDED TRUE) set(__PYTHON_QT_BINDING_SIP_HELPER_DIR ${CMAKE_CURRENT_LIST_DIR}) +# By default, without the settings below, find_package(Python3) will attempt +# to find the newest python version it can, and additionally will find the +# most specific version. For instance, on a system that has +# /usr/bin/python3.10, /usr/bin/python3.11, and /usr/bin/python3, it will find +# /usr/bin/python3.11, even if /usr/bin/python3 points to /usr/bin/python3.10. +# The behavior we want is to prefer the "system" installed version unless the +# user specifically tells us othewise through the Python3_EXECUTABLE hint. +# Setting CMP0094 to NEW means that the search will stop after the first +# python version is found. Setting Python3_FIND_UNVERSIONED_NAMES means that +# the search will prefer /usr/bin/python3 over /usr/bin/python3.11. And that +# latter functionality is only available in CMake 3.20 or later, so we need +# at least that version. +cmake_minimum_required(VERSION 3.20) +cmake_policy(SET CMP0094 NEW) +set(Python3_FIND_UNVERSIONED_NAMES FIRST) + find_package(Python3 ${Python3_VERSION} REQUIRED COMPONENTS Interpreter Development) execute_process(