diff options
| author | b-r-o-c-k <brockmammen@gmail.com> | 2018-06-24 13:21:52 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-24 20:21:52 +0200 |
| commit | 15bd936b965fae922b30d1ead5780b6e1c4886ca (patch) | |
| tree | e89bd6da5b6b58b6ff337d9bbbcaef562932b1cb | |
| parent | 3d688cc25dab84b3b4647d6148ad905e6a5e5a64 (diff) | |
| download | rneovim-15bd936b965fae922b30d1ead5780b6e1c4886ca.tar.gz rneovim-15bd936b965fae922b30d1ead5780b6e1c4886ca.tar.bz2 rneovim-15bd936b965fae922b30d1ead5780b6e1c4886ca.zip | |
win/deps: Fix copy to subdir (#8636)
The `external_blobs` target was not copying dependency files into
the correct subdirectories. This caused a bug where nvim-qt wouldn't
start because `qwindows.dll` was not located in the `platforms`
subdirectory.
closes https://github.com/equalsraf/neovim-qt/issues/422
| -rw-r--r-- | src/nvim/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 15eb824d38..7106f76a6e 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -457,9 +457,10 @@ if(WIN32) platforms/qwindows.dll ) + get_filename_component(DEP_FILE_DIR ${DEP_FILE} DIRECTORY) set(EXTERNAL_BLOBS_SCRIPT "${EXTERNAL_BLOBS_SCRIPT}\n" "file(COPY \"${DEPS_PREFIX}/bin/${DEP_FILE}\" - DESTINATION \"${PROJECT_BINARY_DIR}/windows_runtime_deps/\")") + DESTINATION \"${PROJECT_BINARY_DIR}/windows_runtime_deps/${DEP_FILE_DIR}\")") endforeach() file(WRITE ${PROJECT_BINARY_DIR}/external_blobs.cmake ${EXTERNAL_BLOBS_SCRIPT}) add_custom_target(external_blobs |