diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2022-06-28 13:35:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 13:35:56 +0200 |
| commit | e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a (patch) | |
| tree | 7714844409ed8d84f5f408590b1d7cb82bfd5f0b /src/nvim | |
| parent | 9e1474409934cda19e17d41a876415fc25022dce (diff) | |
| parent | 4c0c6f8428681c7ceef1148abe40b7d06079449c (diff) | |
| download | rneovim-e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a.tar.gz rneovim-e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a.tar.bz2 rneovim-e0f605bfd8b40b45a7efc88ffa0ee6b4a8a3307a.zip | |
Merge #19120 build: rename build-related dirs
Diffstat (limited to 'src/nvim')
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 0b29abaf5f..507b8b77f3 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -59,7 +59,7 @@ set(EVENTS_GENERATOR ${GENERATOR_DIR}/gen_events.lua) set(KEYSETS_GENERATOR ${GENERATOR_DIR}/gen_keysets.lua) set(OPTIONS_GENERATOR ${GENERATOR_DIR}/gen_options.lua) set(UNICODE_TABLES_GENERATOR ${GENERATOR_DIR}/gen_unicode_tables.lua) -set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/unicode) +set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/src/unicode) set(GENERATED_UNICODE_TABLES ${GENERATED_DIR}/unicode_tables.generated.h) set(VIM_MODULE_FILE ${GENERATED_DIR}/lua/vim_module.generated.h) set(LUA_EDITOR_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_editor.lua) @@ -244,12 +244,12 @@ if(use_git_version) file(RELATIVE_PATH relbuild "${PROJECT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}") add_custom_target(update_version_stamp ALL COMMAND ${LUA_PRG} scripts/update_version_stamp.lua - ${relbuild}/config/auto/versiondef_git.h + ${relbuild}/cmake.config/auto/versiondef_git.h "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}${NVIM_VERSION_PRERELEASE}" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - BYPRODUCTS ${CMAKE_BINARY_DIR}/config/auto/versiondef_git.h) + BYPRODUCTS ${CMAKE_BINARY_DIR}/cmake.config/auto/versiondef_git.h) else() - file(WRITE ${CMAKE_BINARY_DIR}/config/auto/versiondef_git.h "") + file(WRITE ${CMAKE_BINARY_DIR}/cmake.config/auto/versiondef_git.h "") endif() # NVIM_GENERATED_FOR_HEADERS: generated headers to be included in headers @@ -394,7 +394,7 @@ list(APPEND NVIM_GENERATED_FOR_SOURCES ) list(APPEND NVIM_GENERATED_SOURCES - "${PROJECT_BINARY_DIR}/config/auto/pathdef.c" + "${PROJECT_BINARY_DIR}/cmake.config/auto/pathdef.c" ) add_custom_command(OUTPUT ${GENERATED_EX_CMDS_ENUM} ${GENERATED_EX_CMDS_DEFS} |