Cmake: test for liblld

CMakeLists.txt

@@ -275,6 +275,9 @@ include (cmake/find_rdkafka.cmake)
 include (cmake/find_capnp.cmake)
 include (cmake/find_llvm.cmake)
 include (cmake/find_cpuid.cmake)
+if (ENABLE_TESTS)
+    include (cmake/find_gtest.cmake)
+endif ()
 
 include (cmake/find_contrib_lib.cmake)
 find_contrib_lib(cityhash)

cmake/find_llvm.cmake

@@ -24,6 +24,15 @@ if (ENABLE_EMBEDDED_COMPILER)
             endif ()
         endif ()
 
+        if (LLVM_FOUND)
+            find_library (LLD_LIBRARY_TEST lldCOFF PATHS ${LLVM_LIBRARY_DIRS})
+            find_path (LLD_INCLUDE_DIR_TEST NAMES lld/Common/Driver.h PATHS ${LLVM_INCLUDE_DIRS})
+            if (NOT LLD_LIBRARY_TEST OR NOT LLD_INCLUDE_DIR_TEST)
+                set (LLVM_FOUND 0)
+                message(WARNING "liblld not found in ${LLVM_INCLUDE_DIRS} ${LLVM_LIBRARY_DIRS}. Disabling internal compiler.")
+            endif ()
+        endif ()
+
         if (LLVM_FOUND)
             # Remove dynamically-linked zlib and libedit from LLVM's dependencies:
             set_target_properties(LLVMSupport PROPERTIES INTERFACE_LINK_LIBRARIES "-lpthread;LLVMDemangle;${ZLIB_LIBRARIES}")

dbms/CMakeLists.txt

@@ -245,8 +245,6 @@ add_subdirectory (programs)
 add_subdirectory (tests)
 
 if (ENABLE_TESTS)
-    include (${ClickHouse_SOURCE_DIR}/cmake/find_gtest.cmake)
-
     if (USE_INTERNAL_GTEST_LIBRARY)
         # Google Test from sources
         add_subdirectory(${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest ${CMAKE_CURRENT_BINARY_DIR}/googletest)

libs/libcommon/src/tests/CMakeLists.txt

@@ -21,7 +21,7 @@ add_check(multi_version)
 add_check(local_date_time_comparison)
 
 add_executable (unit_tests_libcommon gtest_json_test.cpp gtest_strong_typedef.cpp)
-target_link_libraries (unit_tests_libcommon gtest_main common)
+target_link_libraries (unit_tests_libcommon common ${GTEST_MAIN_LIBRARIES})
 add_check(unit_tests_libcommon)
 
 add_executable (dump_variable dump_variable.cpp)