diff options
| author | erw7 <erw7.github@gmail.com> | 2018-05-23 22:02:35 +0900 |
|---|---|---|
| committer | erw7 <erw7.github@gmail.com> | 2018-05-23 22:13:53 +0900 |
| commit | 7f0095cc94d4cef2e839e5c65052874587a27a17 (patch) | |
| tree | c6e9081807850b5dfd1f173052a0ba53df81ddc6 | |
| parent | d337965e0951748fb91bf7c939b01e0f4779d8f0 (diff) | |
| download | rneovim-7f0095cc94d4cef2e839e5c65052874587a27a17.tar.gz rneovim-7f0095cc94d4cef2e839e5c65052874587a27a17.tar.bz2 rneovim-7f0095cc94d4cef2e839e5c65052874587a27a17.zip | |
Change to use RUNTIME target for DLL installation
| -rw-r--r-- | third-party/cmake/BuildLibuv.cmake | 8 | ||||
| -rw-r--r-- | third-party/cmake/LibuvCMakeLists.txt | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake index b9844ada2b..0f2375e29b 100644 --- a/third-party/cmake/BuildLibuv.cmake +++ b/third-party/cmake/BuildLibuv.cmake @@ -68,14 +68,8 @@ elseif(WIN32) set(UV_OUTPUT_DIR ${DEPS_BUILD_DIR}/src/libuv/${CMAKE_BUILD_TYPE}) if(MSVC) - set(INSTALL_CMD ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE} - # Some applications (lua-client/luarocks) look for uv.lib instead of libuv.lib - COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.lib ${DEPS_INSTALL_DIR}/lib/uv.lib - COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.dll ${DEPS_INSTALL_DIR}/bin/ - COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.dll ${DEPS_INSTALL_DIR}/bin/uv.dll) set(BUILD_SHARED ON) elseif(MINGW) - set(INSTALL_CMD ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}) set(BUILD_SHARED OFF) else() message(FATAL_ERROR "Trying to build libuv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") @@ -92,7 +86,7 @@ elseif(WIN32) -DBUILD_SHARED_LIBS=${BUILD_SHARED} -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} - INSTALL_COMMAND ${INSTALL_CMD}) + INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}) else() message(FATAL_ERROR "Trying to build libuv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") diff --git a/third-party/cmake/LibuvCMakeLists.txt b/third-party/cmake/LibuvCMakeLists.txt index 920d5cec07..8b51a101c6 100644 --- a/third-party/cmake/LibuvCMakeLists.txt +++ b/third-party/cmake/LibuvCMakeLists.txt @@ -26,4 +26,5 @@ install(TARGETS uv PUBLIC_HEADER ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |