diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index bb9d4c88fa1..5519b9bb983 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -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 () diff --git a/utils/keeper-bench/CMakeLists.txt b/utils/keeper-bench/CMakeLists.txt index 87fa64b1761..49ce2068246 100644 --- a/utils/keeper-bench/CMakeLists.txt +++ b/utils/keeper-bench/CMakeLists.txt @@ -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) diff --git a/utils/keeper-data-dumper/CMakeLists.txt b/utils/keeper-data-dumper/CMakeLists.txt index 1f55e50e68e..136d6f2268c 100644 --- a/utils/keeper-data-dumper/CMakeLists.txt +++ b/utils/keeper-data-dumper/CMakeLists.txt @@ -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) diff --git a/utils/memcpy-bench/CMakeLists.txt b/utils/memcpy-bench/CMakeLists.txt index 460a06ba851..c0b0b8a589d 100644 --- a/utils/memcpy-bench/CMakeLists.txt +++ b/utils/memcpy-bench/CMakeLists.txt @@ -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