From 64487521f742379230361a917bbcc0daa92d0528 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 20 Oct 2025 13:24:43 +0200 Subject: [PATCH] Raise Boost minimum version to 1.69 Boost 1.69 was released on December 5th, 2018. It made Boost.System header-only, providing a stub library, so we can simply drop system component - see also: https://www.boost.org/doc/libs/1_69_0/libs/system/doc/html/system.html#changes_in_boost_1_69 Set CMake Policy CMP0167 to OLD if available to silence warnings in CMake >=3.30 (use old CMake provided FindBoost.cmake module) Closes: https://invent.kde.org/graphics/krita/-/issues/42 Signed-off-by: Andreas Sturmlechner (cherry picked from commit 87f39a5e846493df94cef498413f85b70f282e6d) --- CMakeLists.txt | 7 ++++++- packaging/windows/package-complete.py | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebfec07d407..bd8f9158a91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,11 @@ if (POLICY CMP0135) cmake_policy(SET CMP0135 NEW) endif() +# in CMake >=3.30; BoostConfig.cmake is shipped only by Boost >=1.82 +if (POLICY CMP0167) + cmake_policy(SET CMP0167 OLD) +endif() + if (APPLE) add_subdirectory(packaging/macos) set(MACOSX_RPATH TRUE) @@ -820,7 +825,7 @@ if (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(Boost_COMPILER "mgw${KRITA_boost_COMPILER_VERSION}") endif() -find_package(Boost 1.65 REQUIRED COMPONENTS system) +find_package(Boost 1.69 REQUIRED) set_package_properties(Boost PROPERTIES DESCRIPTION "Boost provides free peer-reviewed portable C++ source libraries." URL "https://www.boost.org" diff --git a/packaging/windows/package-complete.py b/packaging/windows/package-complete.py index 72b40cef6ee..c87b4907726 100644 --- a/packaging/windows/package-complete.py +++ b/packaging/windows/package-complete.py @@ -439,8 +439,6 @@ print("INFO: Copying all DLLs from lib/ (deps)") files = glob.glob(fr"{DEPS_INSTALL_DIR}\lib\*.dll") for f in files: shutil.copy(f, fr"{pkg_root}\bin") -# Boost, there might be more than one leftover but we can't really do much -files = glob.glob(fr"{DEPS_INSTALL_DIR}\bin\libboost_system-*.dll") for f in files: shutil.copy(f, fr"{pkg_root}\bin") # KF5 plugins may be placed at different locations depending on how Qt is built -- GitLab