diff options
| author | Dundar Goc <gocdundar@gmail.com> | 2022-05-17 15:08:24 +0200 |
|---|---|---|
| committer | Dundar Goc <gocdundar@gmail.com> | 2022-05-17 17:07:45 +0200 |
| commit | a4c0c0704308ee18e3a23954c07666f36cfbb930 (patch) | |
| tree | 35564bf974d20d3e3d7e4490f491bcdd209503ac /third-party/cmake/BuildMsgpack.cmake | |
| parent | f49699737c9b24e1af52719974cf3bc770539ef9 (diff) | |
| download | rneovim-a4c0c0704308ee18e3a23954c07666f36cfbb930.tar.gz rneovim-a4c0c0704308ee18e3a23954c07666f36cfbb930.tar.bz2 rneovim-a4c0c0704308ee18e3a23954c07666f36cfbb930.zip | |
revert: "ci: remove mingw job #18580"
This partially reverts commit f8af81445bb48966d54f4a956842d935d009d275.
The mingw parts of cmake was removed to see if it was still used
(ref: https://github.com/neovim/neovim/pull/18580). It turns out it is,
so this will fix that.
Closes: https://github.com/neovim/neovim/issues/18597
Diffstat (limited to 'third-party/cmake/BuildMsgpack.cmake')
| -rw-r--r-- | third-party/cmake/BuildMsgpack.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/third-party/cmake/BuildMsgpack.cmake b/third-party/cmake/BuildMsgpack.cmake index a89c1e34d0..f66a3bdd32 100644 --- a/third-party/cmake/BuildMsgpack.cmake +++ b/third-party/cmake/BuildMsgpack.cmake @@ -42,7 +42,18 @@ set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack set(MSGPACK_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}) set(MSGPACK_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}) -if(MSVC) +if(MINGW AND CMAKE_CROSSCOMPILING) + get_filename_component(TOOLCHAIN ${CMAKE_TOOLCHAIN_FILE} REALPATH) + set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack + -DMSGPACK_BUILD_TESTS=OFF + -DMSGPACK_BUILD_EXAMPLES=OFF + -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} + # Pass toolchain + -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + # Hack to avoid -rdynamic in Mingw + -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="") +elseif(MSVC) # Same as Unix without fPIC set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack -DMSGPACK_BUILD_TESTS=OFF |