diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-02-09 19:02:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 19:02:01 +0100 |
| commit | 31614d3eb0b6e563eab9a76acf6e33c725b92e60 (patch) | |
| tree | 0bd865cadf66284b15697dabdd8d04aed7efa743 /src | |
| parent | 1ece24a329806778230034da73c25cc434b3bc9d (diff) | |
| parent | ba3778f83b5de2ab670f0fbf5ed9e889e5aefe6e (diff) | |
| download | rneovim-31614d3eb0b6e563eab9a76acf6e33c725b92e60.tar.gz rneovim-31614d3eb0b6e563eab9a76acf6e33c725b92e60.tar.bz2 rneovim-31614d3eb0b6e563eab9a76acf6e33c725b92e60.zip | |
Merge pull request #11841 from bfredl/libdir
build: always create build/lib/nvim so the install command doesn't fail
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index b2ae3a814d..aec258d2fc 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -23,6 +23,7 @@ endif() set(TOUCHES_DIR ${PROJECT_BINARY_DIR}/touches) set(GENERATOR_DIR ${CMAKE_CURRENT_LIST_DIR}/generators) set(GENERATED_DIR ${PROJECT_BINARY_DIR}/src/nvim/auto) +set(BINARY_LIB_DIR ${PROJECT_BINARY_DIR}/lib/nvim/) set(API_DISPATCH_GENERATOR ${GENERATOR_DIR}/gen_api_dispatch.lua) set(API_UI_EVENTS_GENERATOR ${GENERATOR_DIR}/gen_api_ui_events.lua) set(GENERATOR_C_GRAMMAR ${GENERATOR_DIR}/c_grammar.lua) @@ -546,12 +547,14 @@ else() endif() set_target_properties(nvim_runtime_deps PROPERTIES FOLDER deps) +file(MAKE_DIRECTORY ${BINARY_LIB_DIR}) + # install treesitter parser if bundled if(EXISTS ${DEPS_PREFIX}/lib/nvim/parser) - file(COPY ${DEPS_PREFIX}/lib/nvim/parser DESTINATION ${PROJECT_BINARY_DIR}/lib/nvim/) + file(COPY ${DEPS_PREFIX}/lib/nvim/parser DESTINATION ${BINARY_LIB_DIR}) endif() -install(DIRECTORY ${PROJECT_BINARY_DIR}/lib/nvim/ +install(DIRECTORY ${BINARY_LIB_DIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}/nvim/ USE_SOURCE_PERMISSIONS) |