mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tree-sitter: cleanup build code

Browse Source
This commit is contained in:
Björn Linse
2019-06-07 13:15:23 +02:00
parent b871100be7
commit c07e1e8696
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/CMakeLists.txt
View File

@@ -85,10 +85,9 @@ file(GLOB NVIM_HEADERS *.h)
file(GLOB XDIFF_SOURCES xdiff/*.c) file(GLOB XDIFF_SOURCES xdiff/*.c)
file(GLOB XDIFF_HEADERS xdiff/*.h) file(GLOB XDIFF_HEADERS xdiff/*.h)
# when LIBUTF8PROC build is fixed, don't use lib.c with amalgamated utf8proc.c file(GLOB TREESITTER_SOURCES ../tree_sitter/*.c)
file(GLOB TS_SOURCES ../tree_sitter/*.c)
file(GLOB TS_SOURCE_AMALGAM ../tree_sitter/lib.c) file(GLOB TS_SOURCE_AMALGAM ../tree_sitter/lib.c)
list(REMOVE_ITEM TS_SOURCES ${TS_SOURCE_AMALGAM}) list(REMOVE_ITEM TREESITTER_SOURCES ${TS_SOURCE_AMALGAM})
foreach(subdir foreach(subdir
os os
@@ -164,7 +163,7 @@ foreach(sfile ${CONV_SOURCES})
endif() endif()
endforeach() endforeach()
# xdiff: inlined external project, we don't maintain it. #9306 # xdiff: inlined external project, we don't maintain it. #9306
list(APPEND CONV_SOURCES ${XDIFF_SOURCES} ${TS_SOURCES}) list(APPEND CONV_SOURCES ${XDIFF_SOURCES})
if(NOT MSVC) if(NOT MSVC)
set_source_files_properties( set_source_files_properties(
@@ -178,6 +177,9 @@ if(NOT MSVC)
set_source_files_properties( set_source_files_properties(
eval.c PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion") eval.c PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion")
endif() endif()
# tree-sitter: inlined external project, we don't maintain it. #10124
set_source_files_properties(${TREESITTER_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion -Wno-pedantic -Wno-shadow -Wno-missing-prototypes -Wno-unused-variable")
endif() endif()
if(NOT "${MIN_LOG_LEVEL}" MATCHES "^$") if(NOT "${MIN_LOG_LEVEL}" MATCHES "^$")
@@ -421,7 +423,7 @@ endif()
add_executable(nvim ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS} add_executable(nvim ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_HEADERS} ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_HEADERS}
${XDIFF_SOURCES} ${XDIFF_HEADERS} ${TS_SOURCES}) ${XDIFF_SOURCES} ${XDIFF_HEADERS} ${TREESITTER_SOURCES})
target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES}) target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES})
install_helper(TARGETS nvim) install_helper(TARGETS nvim)
@@ -507,7 +509,7 @@ add_library(
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES}
${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS} ${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
${XDIFF_SOURCES} ${XDIFF_HEADERS} ${TS_SOURCES} ${XDIFF_SOURCES} ${XDIFF_HEADERS} ${TREESITTER_SOURCES}
) )
set_property(TARGET libnvim APPEND PROPERTY set_property(TARGET libnvim APPEND PROPERTY
INCLUDE_DIRECTORIES ${LUA_PREFERRED_INCLUDE_DIRS}) INCLUDE_DIRECTORIES ${LUA_PREFERRED_INCLUDE_DIRS})
@@ -532,7 +534,7 @@ else()
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES}
${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS} ${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
${XDIFF_SOURCES} ${XDIFF_HEADERS} ${TS_SOURCES} ${XDIFF_SOURCES} ${XDIFF_HEADERS} ${TREESITTER_SOURCES}
${UNIT_TEST_FIXTURES} ${UNIT_TEST_FIXTURES}
) )
target_link_libraries(nvim-test ${NVIM_TEST_LINK_LIBRARIES}) target_link_libraries(nvim-test ${NVIM_TEST_LINK_LIBRARIES})