napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: make finding-python-version a little more flexible

Browse Source 
My development machine has Python 3.11 installed, with all the
development tools, and 3.12 with only the interpreter. I can't
get find_package(Python3) to find 3.11 unless specifying EXACT,
since it always ends up preferring 3.12 which doesn't have the
required components.
This commit is contained in:
Adriaan de Groot 2024-07-22 23:11:49 +02:00
parent 002b313e0c
commit d6184e5cff
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -37,6 +37,7 @@
# - SCHEMA_TESTING (requires Python, see ci/configvalidator.py) # - SCHEMA_TESTING (requires Python, see ci/configvalidator.py)
# - TESTING (standard CMake option) # - TESTING (standard CMake option)
# DEBUG_<foo> : special developer flags for debugging. # DEBUG_<foo> : special developer flags for debugging.
# PYTHONLIBS_VERSION : if set on the command-line, use a specific Python version
# #
# Example usage: # Example usage:
# #
@ -101,6 +102,14 @@ option(BUILD_CRASH_REPORTING "Enable crash reporting with KCrash." ON)
# - DEBUG_PARTITION_UNSAFE (see partition/CMakeLists.txt) # - DEBUG_PARTITION_UNSAFE (see partition/CMakeLists.txt)
# - DEBUG_PARTITION_BAIL_OUT (see partition/CMakeLists.txt) # - DEBUG_PARTITION_BAIL_OUT (see partition/CMakeLists.txt)
# Special handling for Python versions:
# - If you set PYTHONLIBS_VERSION on the command-line, then
# that **exact** version will be searched for, and no other.
# - If you do not set PYTHONLIBS_VERSION on the command-line,
# any suitable version will be found -- but this can fail if
# you have multiple Python versions installed, only some of
# which include the development headers.
### USE_* ### USE_*
# #
# By convention, when there are multiple modules that implement similar # By convention, when there are multiple modules that implement similar
@ -208,7 +217,12 @@ else()
endif() endif()
set(BOOSTPYTHON_VERSION 1.72.0) set(BOOSTPYTHON_VERSION 1.72.0)
set(PYTHONLIBS_VERSION 3.6) if(DEFINED PYTHONLIBS_VERSION)
set(PYTHONLIBS_EXTRA "EXACT")
else()
set(PYTHONLIBS_VERSION 3.6)
set(PYTHONLIBS_EXTRA "")
endif()
set(YAMLCPP_VERSION 0.5.1) set(YAMLCPP_VERSION 0.5.1)
### CMAKE SETUP ### CMAKE SETUP
@ -412,7 +426,7 @@ if(NOT TARGET ${kfname}::Crash)
set(BUILD_CRASH_REPORTING OFF) set(BUILD_CRASH_REPORTING OFF)
endif() endif()
find_package(Python ${PYTHONLIBS_VERSION} COMPONENTS Interpreter Development) find_package(Python ${PYTHONLIBS_VERSION} ${PYTHONLIBS_EXTRA} COMPONENTS Interpreter Development)
set_package_properties( set_package_properties(
Python Python
PROPERTIES PROPERTIES