diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2022-08-21 23:26:49 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2022-08-21 23:26:49 -0600 |
| commit | 73ede4a508517f8e55c75d710f13851eb8079875 (patch) | |
| tree | b4cccc61b70c28b1474d74d2ff4bff856929cdca /cmake.deps/cmake/BuildMsgpack.cmake | |
| parent | 8436383af96dc7afa3596fc22c012d68e76f47f8 (diff) | |
| parent | 72b03792b6428ca96ca779b53061c6c98f6f930f (diff) | |
| download | rneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.gz rneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.bz2 rneovim-73ede4a508517f8e55c75d710f13851eb8079875.zip | |
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'cmake.deps/cmake/BuildMsgpack.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildMsgpack.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake index 10bf1c8e37..ea3fa84d7b 100644 --- a/cmake.deps/cmake/BuildMsgpack.cmake +++ b/cmake.deps/cmake/BuildMsgpack.cmake @@ -36,7 +36,6 @@ set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP} "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC" -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) @@ -52,8 +51,8 @@ if(MSVC) -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} + ${BUILD_TYPE_STRING} "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1}" - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} # Make sure we use the same generator, otherwise we may # accidentally end up using different MSVC runtimes -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) |