Update

CMakeLists.txt

@@ -37,6 +37,7 @@
 #                       - SCHEMA_TESTING (requires Python, see ci/configvalidator.py)
 #                       - TESTING (standard CMake option)
 #   DEBUG_<foo>     : special developer flags for debugging.
+#   PYTHONLIBS_VERSION : if set on the command-line, use a specific Python version
 #
 # Example usage:
 #
@@ -47,7 +48,7 @@
 
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
-set(CALAMARES_VERSION 3.3.9)
+set(CALAMARES_VERSION 3.3.12)
 set(CALAMARES_RELEASE_MODE ON) # Set to ON during a release
 
 if(CMAKE_SCRIPT_MODE_FILE)
@@ -101,6 +102,14 @@ option(BUILD_CRASH_REPORTING "Enable crash reporting with KCrash." ON)
 #  - DEBUG_PARTITION_UNSAFE (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_*
 #
 # By convention, when there are multiple modules that implement similar
@@ -208,7 +217,12 @@ else()
 endif()
 
 set(BOOSTPYTHON_VERSION 1.72.0)
+if(DEFINED PYTHONLIBS_VERSION)
+    set(PYTHONLIBS_EXTRA "EXACT")
+else()
     set(PYTHONLIBS_VERSION 3.6)
+    set(PYTHONLIBS_EXTRA "")
+endif()
 set(YAMLCPP_VERSION 0.5.1)
 
 ### CMAKE SETUP
@@ -216,23 +230,15 @@ set(YAMLCPP_VERSION 0.5.1)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules")
 
 # Enable IN_LIST
-if(POLICY CMP0057)
 cmake_policy(SET CMP0057 NEW)
-endif()
 # Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files.
-if(POLICY CMP0071)
 cmake_policy(SET CMP0071 NEW)
-endif()
 # Recognize more macros to trigger automoc
-if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
-    list(
-        APPEND
-        CMAKE_AUTOMOC_MACRO_NAMES
+list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
         "K_PLUGIN_FACTORY_WITH_JSON"
         "K_EXPORT_PLASMA_DATAENGINE_WITH_JSON"
         "K_EXPORT_PLASMA_RUNNER"
 )
-endif()
 
 # CMake Modules
 include(CMakePackageConfigHelpers)
@@ -420,7 +426,7 @@ if(NOT TARGET ${kfname}::Crash)
     set(BUILD_CRASH_REPORTING OFF)
 endif()
 
-find_package(Python ${PYTHONLIBS_VERSION} COMPONENTS Interpreter Development)
+find_package(Python ${PYTHONLIBS_VERSION} ${PYTHONLIBS_EXTRA} COMPONENTS Interpreter Development)
 set_package_properties(
     Python
     PROPERTIES