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

build: remove USE_RICEPP_PACKAGE

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-08-07 19:08:11 +02:00
parent cccf6886a9
commit 792a5c32c3
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -42,9 +42,7 @@ endif()
if(APPLE) if(APPLE)
option(USE_HOMEBREW_LIBARCHIVE "use libarchive from homebrew" ON) option(USE_HOMEBREW_LIBARCHIVE "use libarchive from homebrew" ON)
endif() endif()
if(WIN32) if(NOT WIN32)
option(USE_RICEPP_PACKAGE "use pre-built RICEPP package" OFF)
else()
option(WITH_LEGACY_FUSE "build fuse2 driver even if we have fuse3" OFF) option(WITH_LEGACY_FUSE "build fuse2 driver even if we have fuse3" OFF)
option(WITH_MAN_PAGES "build man pages using ronn" ON) option(WITH_MAN_PAGES "build man pages using ronn" ON)
option(ENABLE_ASAN "enable address sanitizer" OFF) option(ENABLE_ASAN "enable address sanitizer" OFF)
@ -598,12 +596,8 @@ if(DWARFS_OPTIMIZE)
endif() endif()
if(ENABLE_RICEPP) if(ENABLE_RICEPP)
if(USE_RICEPP_PACKAGE) # TODO: support FetchContent
find_package(ricepp)
add_library(ricepp ALIAS ricepp::ricepp)
else()
add_subdirectory(ricepp) add_subdirectory(ricepp)
endif()
endif() endif()
list(APPEND list(APPEND
@ -1521,9 +1515,6 @@ endif()
if(PRJ_VERSION_FULL) if(PRJ_VERSION_FULL)
set(DWARFS_ARTIFACT_ID "${PRJ_VERSION_FULL}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") set(DWARFS_ARTIFACT_ID "${PRJ_VERSION_FULL}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
if(USE_RICEPP_PACKAGE)
set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-ricepp")
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-gcc") set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-gcc")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@ -1592,13 +1583,7 @@ if(STATIC_BUILD_DO_NOT_USE OR WIN32)
"binary_tarball=${CMAKE_PROJECT_NAME}-${DWARFS_ARTIFACT_ID}${PACKAGE_EXT}\n" "binary_tarball=${CMAKE_PROJECT_NAME}-${DWARFS_ARTIFACT_ID}${PACKAGE_EXT}\n"
"universal_binary=${UNIVERSAL_OUT}\n") "universal_binary=${UNIVERSAL_OUT}\n")
if(USE_RICEPP_PACKAGE)
add_executable(ricepp_benchmark_fits ricepp/ricepp_benchmark_fits.cpp)
target_link_libraries(ricepp_benchmark_fits PRIVATE ricepp benchmark::benchmark)
set(RICEPP_BENCHMARK_FITS "ricepp_benchmark_fits")
else()
set(RICEPP_BENCHMARK_FITS "ricepp/ricepp_benchmark_fits") set(RICEPP_BENCHMARK_FITS "ricepp/ricepp_benchmark_fits")
endif()
add_custom_target(copy_artifacts add_custom_target(copy_artifacts
COMMAND ${CMAKE_COMMAND} -E make_directory ${ARTIFACTS_FULL_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${ARTIFACTS_FULL_PATH}