Bugfix: Fixes #236, FindPythonInterp is dropped in newer CMake versions

2026-01-26 11:39:44 +00:00 · 2023-11-22 19:11:43 +00:00
parent 645834c730
commit 9ff5265f19
31 changed files with 58 additions and 38 deletions
--- a/base/bldtag/CMakeLists.txt
+++ b/base/bldtag/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-build-tag
--- a/base/bootvid/CMakeLists.txt
+++ b/base/bootvid/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-bootvid
--- a/cursors/no-shadow/standard/CMakeLists.txt
+++ b/cursors/no-shadow/standard/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-cursor-theme-standard-no-shadow
--- a/cursors/with-shadow/standard/CMakeLists.txt
+++ b/cursors/with-shadow/standard/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-cursor-theme-standard-with-shadow
--- a/fonts/CMakeLists.txt
+++ b/fonts/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-fonts-xp
--- a/icons/luna/CMakeLists.txt
+++ b/icons/luna/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-icon-theme-luna
--- a/packaging/cmake-inc/common/CMakeLists.txt
+++ b/packaging/cmake-inc/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.5)

 set(REPO_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../..)

--- a/packaging/cmake-inc/cursors/CMakeLists.txt
+++ b/packaging/cmake-inc/cursors/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)

 # Check stuff we need is defined
 #
@@ -16,12 +16,17 @@ set(CURSOR_COMPCURS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/compiled-cursors)
 # Define function for generating xcursors
 #
 function(wintc_add_gen_xcursors_target)
-    find_package(PythonInterp 3.0 REQUIRED)
+    find_package(
+        Python3
+        COMPONENTS
+            Interpreter
+        REQUIRED
+    )

    add_custom_command(
        OUTPUT ${CURSOR_COMPCURS_OUTPUT_DIR}
        WORKING_DIRECTORY ${CURSOR_COMPCURS_TOOL_DIR}
-        COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${Python3_EXECUTABLE}
        ARGS
            compcurs.py
            ${PROJECT_ROOT}/cfg
--- a/packaging/cmake-inc/icons/CMakeLists.txt
+++ b/packaging/cmake-inc/icons/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 # Check stuff we need is defined
 #
--- a/packaging/cmake-inc/linking/CMakeLists.txt
+++ b/packaging/cmake-inc/linking/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 find_package(PkgConfig REQUIRED)

--- a/packaging/cmake-inc/mappings/CMakeLists.txt
+++ b/packaging/cmake-inc/mappings/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)

 # Define constants
 #
@@ -8,12 +8,17 @@ set(XDG_BLDMAPS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/xdg-compiled-maps)
 # Define function for creating symlinks for themes
 #
 function(wintc_add_mappings_target KIND)
-    find_package(PythonInterp 3.0 REQUIRED)
+    find_package(
+        Python3
+        COMPONENTS
+            Interpreter
+        REQUIRED
+    )

    add_custom_command(
        OUTPUT ${XDG_BLDMAPS_OUTPUT_DIR}
        WORKING_DIRECTORY ${XDG_BLDMAPS_TOOL_DIR}
-        COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${Python3_EXECUTABLE}
        ARGS
            bldmaps.py
            ${PROJECT_ROOT}
--- a/packaging/cmake-inc/packaging/CMakeLists.txt
+++ b/packaging/cmake-inc/packaging/CMakeLists.txt
@@ -47,10 +47,15 @@ function(wintc_map_dependencies)
        return()
    endif()

-    find_package(PythonInterp 3.0 REQUIRED)
+    find_package(
+        Python3
+        COMPONENTS
+            Interpreter
+        REQUIRED
+    )

    execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} ${DEPMAP_TOOL_DIR}/depmap.py deps ${WINTC_PKGMGR}
+        COMMAND ${Python3_EXECUTABLE} ${DEPMAP_TOOL_DIR}/depmap.py deps ${WINTC_PKGMGR}
        WORKING_DIRECTORY ${PROJECT_ROOT}
        OUTPUT_VARIABLE DEPENDENCIES_MAP_RAW
        RESULT_VARIABLE DEPMAP_RET
--- a/packaging/cmake-inc/resources/CMakeLists.txt
+++ b/packaging/cmake-inc/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 # Define build for GResources
 #
--- a/packaging/cmake-inc/sounds/CMakeLists.txt
+++ b/packaging/cmake-inc/sounds/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 # Check stuff we need is defined
 #
--- a/packaging/cmake-inc/themes/CMakeLists.txt
+++ b/packaging/cmake-inc/themes/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)

 # Define some constants for comm build paths
 #
@@ -26,12 +26,17 @@ find_program(SASS scss)

 # Set up venv for bldtheme tool
 #
-find_package(PythonInterp 3.0 REQUIRED)
+find_package(
+    Python3
+    COMPONENTS
+        Interpreter
+    REQUIRED
+)

 add_custom_command(
    OUTPUT ${THEMES_BLDTHEME_TOOL_DIR}/.venv
    WORKING_DIRECTORY ${THEMES_BLDTHEME_TOOL_DIR}
-    COMMAND ${PYTHON_EXECUTABLE}
+    COMMAND ${Python3_EXECUTABLE}
    ARGS
        -m
        venv
--- a/shared/comctl/CMakeLists.txt
+++ b/shared/comctl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    libwintc-comctl
--- a/shared/comgtk/CMakeLists.txt
+++ b/shared/comgtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    libwintc-comgtk
--- a/shared/exec/CMakeLists.txt
+++ b/shared/exec/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    libwintc-exec
--- a/shared/shelldpa/CMakeLists.txt
+++ b/shared/shelldpa/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    libwintc-shelldpa
--- a/shared/shllang/CMakeLists.txt
+++ b/shared/shllang/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    libwintc-shllang
--- a/shared/winbrand/CMakeLists.txt
+++ b/shared/winbrand/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    libwintc-winbrand
--- a/shell/desktop/CMakeLists.txt
+++ b/shell/desktop/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-desktop
--- a/shell/run/CMakeLists.txt
+++ b/shell/run/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-shell-run
--- a/shell/taskband/CMakeLists.txt
+++ b/shell/taskband/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-taskband
--- a/shell/winver/CMakeLists.txt
+++ b/shell/winver/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-shell-winver
--- a/sounds/CMakeLists.txt
+++ b/sounds/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-sound-theme-xp
--- a/themes/build-common/cmake/CMakeLists.txt
+++ b/themes/build-common/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 # Import colour scheme and theme metadata
 #
--- a/themes/luna/blue/CMakeLists.txt
+++ b/themes/luna/blue/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-theme-luna-blue
--- a/themes/native/CMakeLists.txt
+++ b/themes/native/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-theme-native
--- a/themes/professional/CMakeLists.txt
+++ b/themes/professional/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-theme-professional
--- a/windows/notepad/CMakeLists.txt
+++ b/windows/notepad/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(
    wintc-notepad