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

build: CMakeLists.txt cleanup

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-05-15 12:01:11 +02:00
parent 998462db39
commit ba4955fb32
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -935,19 +935,6 @@ if(WITH_MAN_PAGES)
add_custom_target(manpages ALL DEPENDS ${MAN_PAGES}) add_custom_target(manpages ALL DEPENDS ${MAN_PAGES})
endif() endif()
list(
APPEND
INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}/folly
${CMAKE_CURRENT_BINARY_DIR}/thrift
${CMAKE_CURRENT_SOURCE_DIR}/folly
${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
${CMAKE_CURRENT_BINARY_DIR})
if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/zstd/lib)
endif()
set(DWARFS_USE_EXCEPTION_TRACER OFF) set(DWARFS_USE_EXCEPTION_TRACER OFF)
if(NOT STATIC_BUILD_DO_NOT_USE) if(NOT STATIC_BUILD_DO_NOT_USE)
if(TARGET folly_exception_tracer) if(TARGET folly_exception_tracer)
@ -976,7 +963,10 @@ add_library(
set_property(TARGET thrift_light PROPERTY CXX_STANDARD 20) set_property(TARGET thrift_light PROPERTY CXX_STANDARD 20)
target_link_libraries(thrift_light folly_light) target_link_libraries(thrift_light folly_light)
target_include_directories(thrift_light SYSTEM PRIVATE ${INCLUDE_DIRS}) target_include_directories(thrift_light SYSTEM PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
${CMAKE_CURRENT_BINARY_DIR}
)
add_cpp2_thrift_library(fbthrift/thrift/lib/thrift/frozen.thrift add_cpp2_thrift_library(fbthrift/thrift/lib/thrift/frozen.thrift
OUTPUT_PATH lib/thrift NO_LIBRARY) OUTPUT_PATH lib/thrift NO_LIBRARY)
@ -994,14 +984,14 @@ target_link_libraries(compression_thrift thrift_light)
target_link_libraries(history_thrift thrift_light) target_link_libraries(history_thrift thrift_light)
target_link_libraries(features_thrift thrift_light) target_link_libraries(features_thrift thrift_light)
target_link_libraries(dwarfs_categorizer metadata_thrift)
foreach(tgt dwarfs dwarfs_compression dwarfs_categorizer foreach(tgt dwarfs dwarfs_compression dwarfs_categorizer
dwarfs_compression_metadata dwarfs_tool dwarfs_compression_metadata dwarfs_tool
${BINARY_TARGETS} ${TEST_TARGETS} ${MAIN_TARGETS}) ${BINARY_TARGETS} ${TEST_TARGETS} ${MAIN_TARGETS})
set_target_properties(${tgt} PROPERTIES EXPORT_COMPILE_COMMANDS ON) set_target_properties(${tgt} PROPERTIES EXPORT_COMPILE_COMMANDS ON)
target_include_directories( target_link_libraries(${tgt} Boost::boost folly_light thrift_light)
${tgt} SYSTEM PRIVATE
${Boost_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${INCLUDE_DIRS})
target_include_directories(${tgt} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(${tgt} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
@ -1092,12 +1082,14 @@ target_include_directories(dwarfs SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/fss
target_link_libraries( target_link_libraries(
dwarfs dwarfs
Boost::boost
Boost::chrono
Boost::iostreams
metadata_thrift metadata_thrift
history_thrift history_thrift
features_thrift features_thrift
folly_light
fsst fsst
${Boost_LIBRARIES}) )
# if(LIBMAGIC_FOUND) # if(LIBMAGIC_FOUND)
# target_link_libraries(dwarfs PkgConfig::LIBMAGIC) # target_link_libraries(dwarfs PkgConfig::LIBMAGIC)