Unverified Commit b9c641b2 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

heaptrack: fix build with CMake 4 and Boost 1.89 (#493847)

parents 9a3430e6 1e6073cf
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b859fbd..4ed051c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ if (APPIMAGE_BUILD)
 endif()

 include(FeatureSummary)
-find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS system filesystem iostreams container)
+find_package(Boost 1.60.0 ${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)
diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt
index 8e16ff2..340eb7f 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 system filesystem)
+find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options filesystem)

 configure_file(analyze_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/analyze_config.h)
+10 −0
Original line number Diff line number Diff line
diff --git a/3rdparty/robin-map/CMakeLists.txt b/3rdparty/robin-map/CMakeLists.txt
index fab865a..6cbd8c9 100644
--- a/3rdparty/robin-map/CMakeLists.txt
+++ b/3rdparty/robin-map/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)

 project(tsl-robin-map VERSION 1.3.0 LANGUAGES CXX)
+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ stdenv.mkDerivation {
    hash = "sha256-8NLpp/+PK3wIB5Sx0Z1185DCDQ18zsGj9Wp5YNKgX8E=";
  };

  patches = [
    ./boost-189.patch
    ./cmake-minimum-required.patch
  ];

  nativeBuildInputs = [
    cmake
    kdePackages.extra-cmake-modules