TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-10 21:10:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: workaround for new boost versions which have a process component

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-08-25 10:10:21 +02:00
parent 744e9fb52b
commit 6c8a1cdbd3
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -187,7 +187,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/need_range_v3.cmake)
if(WITH_LIBDWARFS) if(WITH_LIBDWARFS)
include(${CMAKE_SOURCE_DIR}/cmake/need_phmap.cmake) include(${CMAKE_SOURCE_DIR}/cmake/need_phmap.cmake)
find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED COMPONENTS chrono iostreams program_options) find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED CONFIG
COMPONENTS chrono iostreams program_options
OPTIONAL_COMPONENTS process)
if(APPLE) if(APPLE)
if(USE_HOMEBREW_LIBARCHIVE) if(USE_HOMEBREW_LIBARCHIVE)

4
cmake/dwarfs-config.cmake.in
View File

@ -21,7 +21,9 @@ endif()
find_dependency(Threads REQUIRED) find_dependency(Threads REQUIRED)
find_dependency(fmt CONFIG REQUIRED) find_dependency(fmt CONFIG REQUIRED)
find_dependency(gflags CONFIG REQUIRED) find_dependency(gflags CONFIG REQUIRED)
find_dependency(Boost @BOOST_REQUIRED_VERSION@ REQUIRED COMPONENTS chrono context filesystem iostreams program_options regex system thread) find_dependency(Boost @BOOST_REQUIRED_VERSION@ REQUIRED CONFIG
COMPONENTS chrono context filesystem iostreams program_options regex system thread
OPTIONAL_COMPONENTS process)
pkg_check_modules(LIBCRYPTO REQUIRED IMPORTED_TARGET libcrypto>=@LIBCRYPTO_REQUIRED_VERSION@) pkg_check_modules(LIBCRYPTO REQUIRED IMPORTED_TARGET libcrypto>=@LIBCRYPTO_REQUIRED_VERSION@)
pkg_check_modules(LIBARCHIVE REQUIRED IMPORTED_TARGET libarchive>=@LIBARCHIVE_REQUIRED_VERSION@) pkg_check_modules(LIBARCHIVE REQUIRED IMPORTED_TARGET libarchive>=@LIBARCHIVE_REQUIRED_VERSION@)
pkg_check_modules(XXHASH REQUIRED IMPORTED_TARGET libxxhash>=@XXHASH_REQUIRED_VERSION@) pkg_check_modules(XXHASH REQUIRED IMPORTED_TARGET libxxhash>=@XXHASH_REQUIRED_VERSION@)

4
cmake/libdwarfs.cmake
View File

@ -221,6 +221,10 @@ target_link_libraries(
dwarfs_fsst dwarfs_fsst
) )
if(TARGET Boost::process)
target_link_libraries(dwarfs_common PUBLIC Boost::process)
endif()
list(APPEND LIBDWARFS_TARGETS list(APPEND LIBDWARFS_TARGETS
dwarfs_common dwarfs_common
dwarfs_reader dwarfs_reader