From c1e1ff1a976fc12ecffe2a739542ae5c74959fda Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 13 May 2018 19:09:26 -0700 Subject: [PATCH] Congratulations to Tea Deliverers --- CMakeLists.txt | 4 ---- cmake/FindClang.cmake | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 010258ad..a8a1d157 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,11 +105,7 @@ endif() # See cmake/FindClang.cmake find_package(Clang ${CLANG_VERSION} REQUIRED) -find_package(Curses REQUIRED) target_link_libraries(ccls PRIVATE Clang::Clang) -if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL Windows) - target_link_libraries(ccls PRIVATE Clang::Clang ${CURSES_LIBRARIES}) -endif() # Enable threading support set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake index 9524ca23..f413be8d 100644 --- a/cmake/FindClang.cmake +++ b/cmake/FindClang.cmake @@ -113,5 +113,6 @@ if(Clang_FOUND AND NOT TARGET Clang::Clang) IMPORTED_LOCATION ${Clang_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES "${Clang_INCLUDE_DIR};${Clang_BUILD_INCLUDE_DIR};${LLVM_INCLUDE_DIR};${LLVM_BUILD_INCLUDE_DIR}") - set_property(TARGET Clang::Clang PROPERTY INTERFACE_LINK_LIBRARIES ${_Clang_LIBRARIES}) + find_package(Curses REQUIRED) + set_property(TARGET Clang::Clang PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES "${_Clang_LIBRARIES};${CURSES_LIBRARIES}") endif()