diff --git a/contrib/abseil-cpp-cmake/CMakeLists.txt b/contrib/abseil-cpp-cmake/CMakeLists.txt
index 4fb02327d17..4c31ecfc599 100644
--- a/contrib/abseil-cpp-cmake/CMakeLists.txt
+++ b/contrib/abseil-cpp-cmake/CMakeLists.txt
@@ -1,7 +1,4 @@
 set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
-if(NOT EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt")
-  message(FATAL_ERROR " submodule third_party/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
-endif()
 set(BUILD_TESTING OFF)
 set(ABSL_PROPAGATE_CXX_STD ON)
 add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")
diff --git a/contrib/amqpcpp-cmake/CMakeLists.txt b/contrib/amqpcpp-cmake/CMakeLists.txt
index 6e655d3c255..e5c17c234e9 100644
--- a/contrib/amqpcpp-cmake/CMakeLists.txt
+++ b/contrib/amqpcpp-cmake/CMakeLists.txt
@@ -5,6 +5,7 @@ if (NOT ENABLE_AMQPCPP)
     return()
 endif()
 
+# can be removed once libuv build on MacOS with GCC is possible
 if (NOT TARGET ch_contrib::uv)
     message(STATUS "Not using AMQP-CPP because libuv is disabled")
     return()
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
index a4574493440..74bbb300fa5 100644
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 option (ENABLE_PARQUET "Enable parquet" ${ENABLE_PARQUET_DEFAULT})
 
 if (NOT ENABLE_PARQUET)
-    message(STATUS "Building without Parquet support")
+    message(STATUS "Not using parquet")
     return()
 endif()
 
diff --git a/contrib/bzip2-cmake/CMakeLists.txt b/contrib/bzip2-cmake/CMakeLists.txt
index 2e01a624000..693d4c1663c 100644
--- a/contrib/bzip2-cmake/CMakeLists.txt
+++ b/contrib/bzip2-cmake/CMakeLists.txt
@@ -1,6 +1,6 @@
 option(ENABLE_BZIP2 "Enable bzip2 compression support" ${ENABLE_LIBRARIES})
 if (NOT ENABLE_BZIP2)
-    message (STATUS "bzip2 compression disabled")
+    message (STATUS "Not using bzip2")
     return()
 endif()
 
@@ -26,8 +26,4 @@ configure_file (
 
 add_library(_bzip2 ${SRCS})
 add_library(ch_contrib::bzip2 ALIAS _bzip2)
-# To avoid -Wreserved-id-macro we use SYSTEM:
-#
-#     clickhouse/contrib/bzip2/bzlib.h:23:9: error: macro name is a reserved identifier [-Werror,-Wreserved-id-macro]
-#     #define _BZLIB_H
 target_include_directories(_bzip2 SYSTEM BEFORE PUBLIC "${BZIP2_SOURCE_DIR}" "${BZIP2_BINARY_DIR}")
diff --git a/contrib/cassandra-cmake/CMakeLists.txt b/contrib/cassandra-cmake/CMakeLists.txt
index 986ac438bb2..59ff908b63a 100644
--- a/contrib/cassandra-cmake/CMakeLists.txt
+++ b/contrib/cassandra-cmake/CMakeLists.txt
@@ -5,6 +5,7 @@ if (NOT ENABLE_CASSANDRA)
     return()
 endif()
 
+# can be removed once libuv build on MacOS with GCC is possible
 if (NOT TARGET ch_contrib::uv)
     message(STATUS "Not using cassandra because libuv is disabled")
     return()
diff --git a/contrib/cppkafka-cmake/CMakeLists.txt b/contrib/cppkafka-cmake/CMakeLists.txt
index 87bf2356a80..fa1c52180e8 100644
--- a/contrib/cppkafka-cmake/CMakeLists.txt
+++ b/contrib/cppkafka-cmake/CMakeLists.txt
@@ -1,5 +1,5 @@
 if (NOT ENABLE_KAFKA)
-    message(STATUS "Not using librdkafka (skip cppkafka)")
+    message(STATUS "Not using kafka")
     return()
 endif()
 
diff --git a/contrib/fastops-cmake/CMakeLists.txt b/contrib/fastops-cmake/CMakeLists.txt
index 17d6a7f5fcb..e9aa4803583 100644
--- a/contrib/fastops-cmake/CMakeLists.txt
+++ b/contrib/fastops-cmake/CMakeLists.txt
@@ -5,7 +5,7 @@ elseif(ENABLE_FASTOPS)
 endif()
 
 if(NOT ENABLE_FASTOPS)
-    message(STATUS "Not using fast vectorized mathematical functions library by Mikhail Parakhin")
+    message(STATUS "Not using fastops")
     return()
 endif()
 
diff --git a/contrib/fmtlib-cmake/CMakeLists.txt b/contrib/fmtlib-cmake/CMakeLists.txt
index fecec5f3e43..fe399ddc6e1 100644
--- a/contrib/fmtlib-cmake/CMakeLists.txt
+++ b/contrib/fmtlib-cmake/CMakeLists.txt
@@ -1,22 +1,24 @@
+set(FMT_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/fmtlib")
+
 set (SRCS
     # NOTE: do not build module for now:
     # ../fmtlib/src/fmt.cc
-    ../fmtlib/src/format.cc
-    ../fmtlib/src/os.cc
+    ${FMT_SOURCE_DIR}/src/format.cc
+    ${FMT_SOURCE_DIR}/src/os.cc
 
-    ../fmtlib/include/fmt/args.h
-    ../fmtlib/include/fmt/chrono.h
-    ../fmtlib/include/fmt/color.h
-    ../fmtlib/include/fmt/compile.h
-    ../fmtlib/include/fmt/core.h
-    ../fmtlib/include/fmt/format.h
-    ../fmtlib/include/fmt/format-inl.h
-    ../fmtlib/include/fmt/locale.h
-    ../fmtlib/include/fmt/os.h
-    ../fmtlib/include/fmt/ostream.h
-    ../fmtlib/include/fmt/printf.h
-    ../fmtlib/include/fmt/ranges.h
-    ../fmtlib/include/fmt/xchar.h
+    ${FMT_SOURCE_DIR}/include/fmt/args.h
+    ${FMT_SOURCE_DIR}/include/fmt/chrono.h
+    ${FMT_SOURCE_DIR}/include/fmt/color.h
+    ${FMT_SOURCE_DIR}/include/fmt/compile.h
+    ${FMT_SOURCE_DIR}/include/fmt/core.h
+    ${FMT_SOURCE_DIR}/include/fmt/format.h
+    ${FMT_SOURCE_DIR}/include/fmt/format-inl.h
+    ${FMT_SOURCE_DIR}/include/fmt/locale.h
+    ${FMT_SOURCE_DIR}/include/fmt/os.h
+    ${FMT_SOURCE_DIR}/include/fmt/ostream.h
+    ${FMT_SOURCE_DIR}/include/fmt/printf.h
+    ${FMT_SOURCE_DIR}/include/fmt/ranges.h
+    ${FMT_SOURCE_DIR}/include/fmt/xchar.h
 )
 
 add_library(_fmt ${SRCS})
diff --git a/contrib/h3-cmake/CMakeLists.txt b/contrib/h3-cmake/CMakeLists.txt
index 984d1b1ae7c..869550224e6 100644
--- a/contrib/h3-cmake/CMakeLists.txt
+++ b/contrib/h3-cmake/CMakeLists.txt
@@ -9,23 +9,23 @@ set(H3_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib")
 set(H3_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib")
 
 set(SRCS
-"${H3_SOURCE_DIR}/lib/algos.c"
-"${H3_SOURCE_DIR}/lib/coordijk.c"
-"${H3_SOURCE_DIR}/lib/bbox.c"
-"${H3_SOURCE_DIR}/lib/polygon.c"
-"${H3_SOURCE_DIR}/lib/h3Index.c"
-"${H3_SOURCE_DIR}/lib/vec2d.c"
-"${H3_SOURCE_DIR}/lib/vec3d.c"
-"${H3_SOURCE_DIR}/lib/vertex.c"
-"${H3_SOURCE_DIR}/lib/linkedGeo.c"
-"${H3_SOURCE_DIR}/lib/localij.c"
-"${H3_SOURCE_DIR}/lib/latLng.c"
-"${H3_SOURCE_DIR}/lib/directedEdge.c"
-"${H3_SOURCE_DIR}/lib/mathExtensions.c"
-"${H3_SOURCE_DIR}/lib/iterators.c"
-"${H3_SOURCE_DIR}/lib/vertexGraph.c"
-"${H3_SOURCE_DIR}/lib/faceijk.c"
-"${H3_SOURCE_DIR}/lib/baseCells.c"
+    "${H3_SOURCE_DIR}/lib/algos.c"
+    "${H3_SOURCE_DIR}/lib/coordijk.c"
+    "${H3_SOURCE_DIR}/lib/bbox.c"
+    "${H3_SOURCE_DIR}/lib/polygon.c"
+    "${H3_SOURCE_DIR}/lib/h3Index.c"
+    "${H3_SOURCE_DIR}/lib/vec2d.c"
+    "${H3_SOURCE_DIR}/lib/vec3d.c"
+    "${H3_SOURCE_DIR}/lib/vertex.c"
+    "${H3_SOURCE_DIR}/lib/linkedGeo.c"
+    "${H3_SOURCE_DIR}/lib/localij.c"
+    "${H3_SOURCE_DIR}/lib/latLng.c"
+    "${H3_SOURCE_DIR}/lib/directedEdge.c"
+    "${H3_SOURCE_DIR}/lib/mathExtensions.c"
+    "${H3_SOURCE_DIR}/lib/iterators.c"
+    "${H3_SOURCE_DIR}/lib/vertexGraph.c"
+    "${H3_SOURCE_DIR}/lib/faceijk.c"
+    "${H3_SOURCE_DIR}/lib/baseCells.c"
 )
 
 configure_file("${H3_SOURCE_DIR}/include/h3api.h.in" "${H3_BINARY_DIR}/include/h3api.h")
diff --git a/contrib/hive-metastore-cmake/CMakeLists.txt b/contrib/hive-metastore-cmake/CMakeLists.txt
index 9069d46cea7..a5e16c739af 100644
--- a/contrib/hive-metastore-cmake/CMakeLists.txt
+++ b/contrib/hive-metastore-cmake/CMakeLists.txt
@@ -5,7 +5,7 @@ elseif(ENABLE_HIVE)
 endif()
 
 if (NOT ENABLE_HIVE)
-    message("Hive disabled")
+    message(STATUS "Not using hive")
     return()
 endif()
 
diff --git a/contrib/libcpuid-cmake/CMakeLists.txt b/contrib/libcpuid-cmake/CMakeLists.txt
index 1940b39b6aa..95f653c7ea2 100644
--- a/contrib/libcpuid-cmake/CMakeLists.txt
+++ b/contrib/libcpuid-cmake/CMakeLists.txt
@@ -6,7 +6,7 @@ elseif(ENABLE_CPUID)
 endif()
 
 if (NOT ENABLE_CPUID)
-    message("Not using cpuid")
+    message(STATUS "Not using cpuid")
     return()
 endif()
 
diff --git a/contrib/libgsasl-cmake/CMakeLists.txt b/contrib/libgsasl-cmake/CMakeLists.txt
index 4bb4ca9dc33..3cf087c2f4c 100644
--- a/contrib/libgsasl-cmake/CMakeLists.txt
+++ b/contrib/libgsasl-cmake/CMakeLists.txt
@@ -1,7 +1,7 @@
 option(ENABLE_GSASL_LIBRARY "Enable gsasl library" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_GSASL_LIBRARY)
-    message(STATUS "Not using gsasl library")
+    message(STATUS "Not using gsasl")
     return()
 endif()
 
diff --git a/contrib/libuv-cmake/CMakeLists.txt b/contrib/libuv-cmake/CMakeLists.txt
index 45f6d8e2083..1a7714e47ce 100644
--- a/contrib/libuv-cmake/CMakeLists.txt
+++ b/contrib/libuv-cmake/CMakeLists.txt
@@ -1,3 +1,4 @@
+# once fixed, please remove similar places in CMakeLists of libuv users (search "ch_contrib::uv")
 if (OS_DARWIN AND COMPILER_GCC)
     message (WARNING "libuv cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082")
     return()
diff --git a/contrib/minizip-ng-cmake/CMakeLists.txt b/contrib/minizip-ng-cmake/CMakeLists.txt
index 4aabbd3c9fb..043f0fc68f9 100644
--- a/contrib/minizip-ng-cmake/CMakeLists.txt
+++ b/contrib/minizip-ng-cmake/CMakeLists.txt
@@ -1,6 +1,6 @@
 option(ENABLE_MINIZIP "Enable minizip-ng the zip manipulation library" ${ENABLE_LIBRARIES})
 if (NOT ENABLE_MINIZIP)
-    message (STATUS "minizip-ng disabled")
+    message (STATUS "Not using minizip-ng")
     return()
 endif()
 
diff --git a/contrib/nanodbc-cmake/CMakeLists.txt b/contrib/nanodbc-cmake/CMakeLists.txt
index 9ed6c9525b6..7aacf5bed7e 100644
--- a/contrib/nanodbc-cmake/CMakeLists.txt
+++ b/contrib/nanodbc-cmake/CMakeLists.txt
@@ -2,12 +2,12 @@ if (NOT ENABLE_ODBC)
     return ()
 endif ()
 
-set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc")
-
 if (NOT TARGET ch_contrib::unixodbc)
     message(FATAL_ERROR "Configuration error: unixodbc is not a target")
 endif()
 
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc")
+
 set (SRCS
     "${LIBRARY_DIR}/nanodbc/nanodbc.cpp"
 )
diff --git a/contrib/thrift-cmake/CMakeLists.txt b/contrib/thrift-cmake/CMakeLists.txt
index 2a62a6fe7ab..6f94c1ebdc0 100644
--- a/contrib/thrift-cmake/CMakeLists.txt
+++ b/contrib/thrift-cmake/CMakeLists.txt
@@ -1,7 +1,7 @@
 option(ENABLE_THRIFT "Enable Thrift" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_THRIFT)
-    message (STATUS "thrift disabled")
+    message (STATUS "Not using thrift")
     return()
 endif()