1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From: "Stefan Cristian B." <stefan.cristian+git@rogentos.ro>
Date: Sat, 9 Aug 2025 02:04:47 +0300
Subject: [PATCH] Fixed boost python component detection mechanism
---
CMakeLists.txt | 36 +++++++++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 266414906..ee6717499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,10 +38,13 @@
# - TESTING (standard CMake option)
# DEBUG_<foo> : special developer flags for debugging.
# PYTHONLIBS_VERSION : if set on the command-line, use a specific Python version
+# BOOSTPYTHON_COMPONENT : if set on the command-line, use a specific Boost Python component
+# (e.g., python313 for Python 3.13, default is "python")
#
# Example usage:
#
# cmake . -DSKIP_MODULES="partition luksbootkeycfg"
+# cmake . -DWITH_PYBIND11=OFF -DBOOSTPYTHON_COMPONENT=python313
#
# To obtain the version number of calamares, run CMake in script mode, e.g.
# cmake -P CMakeLists.txt
@@ -219,6 +222,10 @@ else()
endif()
set(BOOSTPYTHON_VERSION 1.72.0)
+if(NOT DEFINED BOOSTPYTHON_COMPONENT)
+ set(BOOSTPYTHON_COMPONENT "python")
+endif()
+
if(DEFINED PYTHONLIBS_VERSION)
set(PYTHONLIBS_EXTRA "EXACT")
else()
@@ -241,6 +248,9 @@ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
"K_EXPORT_PLASMA_DATAENGINE_WITH_JSON"
"K_EXPORT_PLASMA_RUNNER"
)
+if(POLICY CMP0167)
+ cmake_policy(SET CMP0167 NEW)
+endif()
if(POLICY CMP0171)
cmake_policy(SET CMP0177 NEW)
endif()
@@ -494,16 +504,32 @@ endif()
if(WITH_PYTHON AND NOT WITH_PYBIND11)
set(WITH_BOOST_PYTHON ON)
- find_package(boost_python)
- if(NOT TARGET Boost::python)
- find_package(Boost ${BOOSTPYTHON_VERSION} COMPONENTS python)
+
+ if(NOT "${BOOSTPYTHON_COMPONENT}" STREQUAL "python")
+ message(STATUS "Using explicitly specified Boost Python component: ${BOOSTPYTHON_COMPONENT}")
+ find_package(Boost ${BOOSTPYTHON_VERSION} CONFIG COMPONENTS ${BOOSTPYTHON_COMPONENT})
set_package_properties(Boost PROPERTIES
PURPOSE "Boost.Python is used for Python job modules (because WITH_PYBIND11 is OFF)."
TYPE REQUIRED
)
+
+ if(TARGET Boost::${BOOSTPYTHON_COMPONENT})
+ add_library(Boost::python ALIAS Boost::${BOOSTPYTHON_COMPONENT})
+ set(Boost_FOUND ON)
+ endif()
else()
- message(STATUS "Found boost_python with target Boost::python")
- set(Boost_FOUND ON)
+ find_package(boost_python)
+ if(NOT TARGET Boost::python)
+ message(STATUS "Using Boost Python component: ${BOOSTPYTHON_COMPONENT}")
+ find_package(Boost ${BOOSTPYTHON_VERSION} CONFIG COMPONENTS ${BOOSTPYTHON_COMPONENT})
+ set_package_properties(Boost PROPERTIES
+ PURPOSE "Boost.Python is used for Python job modules (because WITH_PYBIND11 is OFF)."
+ TYPE REQUIRED
+ )
+ else()
+ message(STATUS "Found boost_python with target Boost::python")
+ set(Boost_FOUND ON)
+ endif()
endif()
endif()
add_feature_info(python WITH_PYTHON "Enable Python-modules")
--
2.49.1
|
