From 0a7173d40d14c8488892ef5fafb8fb58d05c6b57 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 19 Oct 2025 21:05:39 +0200 Subject: [PATCH] Raise Boost minimum version to 1.70 Boost 1.70 was released on April 12th, 2019 This solves multiple issues: - Mainly, with =3.30 - Boost-1.69 introduced zstd compression/decompression filter, so the bundled lib is unnecessary - Boost-1.69 made Boost.System header-only, providing a stub library, so we can simply drop all references - see also: https://www.boost.org/doc/libs/1_69_0/libs/system/doc/html/system.html#changes_in_boost_1_69 Further fix: - Do not expand variables beforehand - see also: https://invent.kde.org/plasma/libplasma/-/merge_requests/267 Signed-off-by: Andreas Sturmlechner --- CMakeLists.txt | 10 ++-------- src/analyze/CMakeLists.txt | 2 +- src/interpret/CMakeLists.txt | 2 +- tests/auto/CMakeLists.txt | 7 ++----- tests/auto/no_asan/CMakeLists.txt | 3 +-- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adc08a3..6846c11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,18 +25,12 @@ if (APPIMAGE_BUILD) endif() include(FeatureSummary) -find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container) -# boost_system no longer exists in 1.89 -if (Boost_VERSION VERSION_LESS 1.89.0) - find_package(Boost ${REQUIRED_IN_APPIMAGE} COMPONENTS system) -else() - set(Boost_SYSTEM_FOUND TRUE) -endif() +find_package(Boost 1.70.0 CONFIG ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container) set_package_properties(Boost PROPERTIES TYPE RECOMMENDED PURPOSE "Boost container libraries can greatly improve performance (via pmr allocators)") find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) -if (${Boost_IOSTREAMS_FOUND}) +if (Boost_IOSTREAMS_FOUND) find_package(ZSTD ${REQUIRED_IN_APPIMAGE}) include(CheckCXXSourceCompiles) diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt index 340eb7f..3bb44d2 100644 --- a/src/analyze/CMakeLists.txt +++ b/src/analyze/CMakeLists.txt @@ -2,7 +2,7 @@ if (ECM_FOUND) include(ECMEnableSanitizers) endif() -find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options filesystem) +find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS iostreams program_options filesystem) configure_file(analyze_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/analyze_config.h) diff --git a/src/interpret/CMakeLists.txt b/src/interpret/CMakeLists.txt index ef0d5be..6cd0857 100644 --- a/src/interpret/CMakeLists.txt +++ b/src/interpret/CMakeLists.txt @@ -3,7 +3,7 @@ if (ECM_FOUND) endif() find_package(Elfutils 0.158 REQUIRED) -find_package(Boost 1.41.0 REQUIRED COMPONENTS program_options) +find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS program_options) include_directories( ${PROJECT_SOURCE_DIR}/3rdparty/ diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index c4959cc..be9712c 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../src/track ) -if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") +if (Boost_FILESYSTEM_FOUND) if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(LIBUTIL_LIBRARY "util") endif() @@ -44,7 +44,7 @@ add_test(NAME tst_trace COMMAND tst_trace) configure_file(tst_heaptrack_interpret.cmake.sh ${CMAKE_CURRENT_BINARY_DIR}/tst_heaptrack_interpret.sh @ONLY) add_test(NAME tst_heaptrack_interpret COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tst_heaptrack_interpret.sh) -if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") +if (Boost_FILESYSTEM_FOUND) add_executable(tst_libheaptrack tst_libheaptrack.cpp ../../src/track/libheaptrack.cpp) @@ -56,7 +56,6 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") ${LIBUTIL_LIBRARY} heaptrack_unwind rt - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) add_test(NAME tst_libheaptrack COMMAND tst_libheaptrack) @@ -64,7 +63,6 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") add_executable(tst_io tst_io.cpp) set_target_properties(tst_io PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}") target_link_libraries(tst_io - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) add_test(NAME tst_io COMMAND tst_io) @@ -75,7 +73,6 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") add_executable(tst_parser tst_parser.cpp) set_target_properties(tst_parser PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}") target_link_libraries(tst_parser - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} heaptrack_gui_private Qt6::Test diff --git a/tests/auto/no_asan/CMakeLists.txt b/tests/auto/no_asan/CMakeLists.txt index 1aed05d..927e6ff 100644 --- a/tests/auto/no_asan/CMakeLists.txt +++ b/tests/auto/no_asan/CMakeLists.txt @@ -1,9 +1,8 @@ -if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") +if (Boost_FILESYSTEM_FOUND) add_executable(tst_inject tst_inject.cpp) set_target_properties(tst_inject PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}") target_link_libraries(tst_inject ${CMAKE_DL_LIBS} - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) add_test(NAME tst_inject COMMAND tst_inject) -- 2.51.1