From f7c0998599c004ad0407326a833208424caf597e Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 18 Jan 2017 01:48:01 +0300 Subject: [PATCH] fix clang build (#353) * Freebsd clang3.8 compile fixes * clean * fix * fix clang build --- contrib/libzlib-ng/CMakeLists.txt | 4 ++++ libs/libzkutil/src/tests/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/libzlib-ng/CMakeLists.txt b/contrib/libzlib-ng/CMakeLists.txt index be9b8eb45f9..4eaf584414d 100644 --- a/contrib/libzlib-ng/CMakeLists.txt +++ b/contrib/libzlib-ng/CMakeLists.txt @@ -540,6 +540,10 @@ endif() # Example binaries #============================================================================ +if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set (CMAKE_EXE_LINKER_FLAGS "") +endif () + add_executable(example test/example.c) target_link_libraries(example zlib) add_test(example example) diff --git a/libs/libzkutil/src/tests/CMakeLists.txt b/libs/libzkutil/src/tests/CMakeLists.txt index 49c8fa568c7..98292d8700b 100644 --- a/libs/libzkutil/src/tests/CMakeLists.txt +++ b/libs/libzkutil/src/tests/CMakeLists.txt @@ -1,7 +1,7 @@ include (${CMAKE_SOURCE_DIR}/cmake/find_readline_edit.cmake) add_executable(zkutil_test zkutil_test.cpp) -target_link_libraries(zkutil_test zkutil dbms ${READLINE_LIB} ${TERMCAP_LIB}) +target_link_libraries(zkutil_test zkutil dbms ${LINE_EDITING_LIBS}) add_executable(zkutil_test_commands zkutil_test_commands.cpp) target_link_libraries(zkutil_test_commands zkutil dbms)