Merge pull request #49598 from ClickHouse/rs/build-utils

CMake: Cleanup utils build
This commit is contained in:
Robert Schulze 2023-05-07 14:11:05 +02:00 committed by GitHub
commit ca05a737c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions

View File

@ -26,13 +26,6 @@ if (NOT DEFINED ENABLE_UTILS OR ENABLE_UTILS)
add_subdirectory (wal-dump)
add_subdirectory (check-mysql-binlog)
add_subdirectory (keeper-bench)
if (TARGET ch_contrib::nuraft)
add_subdirectory (keeper-data-dumper)
endif ()
# memcpy_jart.S contains position dependent code
if (NOT CMAKE_POSITION_INDEPENDENT_CODE AND OS_LINUX AND ARCH_AMD64)
add_subdirectory (memcpy-bench)
endif ()
add_subdirectory (keeper-data-dumper)
add_subdirectory (memcpy-bench)
endif ()

View File

@ -1,7 +1,7 @@
if (NOT TARGET ch_contrib::rapidjson)
message (${RECONFIGURE_MESSAGE_LEVEL} "Not building keeper-bench due to rapidjson is disabled")
return()
endif()
endif ()
clickhouse_add_executable(keeper-bench Generator.cpp Runner.cpp Stats.cpp main.cpp)
target_link_libraries(keeper-bench PRIVATE clickhouse_common_config_no_zookeeper_log ch_contrib::rapidjson)

View File

@ -1,2 +1,7 @@
if (NOT TARGET ch_contrib::nuraft)
message (WARNING "Not building keeper-data-dumper due to nuraft is disabled")
return ()
endif ()
clickhouse_add_executable(keeper-data-dumper main.cpp)
target_link_libraries(keeper-data-dumper PRIVATE dbms)

View File

@ -1,3 +1,9 @@
# memcpy_jart.S contains position dependent code
if (CMAKE_POSITION_INDEPENDENT_CODE OR NOT OS_LINUX OR NOT ARCH_AMD64)
message (WARNING "Not building memcpy-bench due to PIC enabled or not Linux or not x86")
return ()
endif ()
enable_language(ASM)
clickhouse_add_executable (memcpy-bench