diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-06-06 14:13:10 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2019-09-28 14:31:03 +0200 |
| commit | b871100be7a6ae5ce1db23a688c593ecaa2390b8 (patch) | |
| tree | 4b179d7399dace05bb4ef45a9e5d99a124ba61bf /src | |
| parent | 0e0beef85e4d3932e0d49528d8474794f7b69b01 (diff) | |
| download | rneovim-b871100be7a6ae5ce1db23a688c593ecaa2390b8.tar.gz rneovim-b871100be7a6ae5ce1db23a688c593ecaa2390b8.tar.bz2 rneovim-b871100be7a6ae5ce1db23a688c593ecaa2390b8.zip | |
Create BuildUtf8proc.cmake and FindUtf8proc.cmake
Using advanced search and replace technology
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index ebc7e96d66..53a4089e10 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -74,8 +74,6 @@ include_directories(${GENERATED_DIR}) include_directories(${CACHED_GENERATED_DIR}) include_directories(${GENERATED_INCLUDES_DIR}) -include_directories(${LIBUTF8PROC_INCLUDE_DIRS}) - file(MAKE_DIRECTORY ${TOUCHES_DIR}) file(MAKE_DIRECTORY ${GENERATED_DIR}) file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}) @@ -88,8 +86,9 @@ file(GLOB XDIFF_SOURCES xdiff/*.c) file(GLOB XDIFF_HEADERS xdiff/*.h) # when LIBUTF8PROC build is fixed, don't use lib.c with amalgamated utf8proc.c -#file(GLOB TS_SOURCES tree_sitter/*.c) -file(GLOB TS_SOURCES ../tree_sitter/lib.c) +file(GLOB TS_SOURCES ../tree_sitter/*.c) +file(GLOB TS_SOURCE_AMALGAM ../tree_sitter/lib.c) +list(REMOVE_ITEM TS_SOURCES ${TS_SOURCE_AMALGAM}) foreach(subdir os @@ -402,6 +401,7 @@ list(APPEND NVIM_LINK_LIBRARIES ${LIBVTERM_LIBRARIES} ${LIBTERMKEY_LIBRARIES} ${UNIBILIUM_LIBRARIES} + ${UTF8PROC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) |