diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2022-10-02 19:20:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 19:20:40 -0400 |
| commit | 56998feebd6f7ec0ab68e44cba3425bf39d448b4 (patch) | |
| tree | a292094f71be1f83aab74aaef20914c77ef2ebad /cmake.deps/cmake/BuildMsgpack.cmake | |
| parent | 67e57d21b351a4fe4b32ec76998e45fe00d57186 (diff) | |
| parent | fbc66d798ce834c4ba05360c3c07ce7af40d6fc9 (diff) | |
| download | rneovim-56998feebd6f7ec0ab68e44cba3425bf39d448b4.tar.gz rneovim-56998feebd6f7ec0ab68e44cba3425bf39d448b4.tar.bz2 rneovim-56998feebd6f7ec0ab68e44cba3425bf39d448b4.zip | |
Merge #20154 build: cmake cleanup
Diffstat (limited to 'cmake.deps/cmake/BuildMsgpack.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildMsgpack.cmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake index f79117e4b1..da62741811 100644 --- a/cmake.deps/cmake/BuildMsgpack.cmake +++ b/cmake.deps/cmake/BuildMsgpack.cmake @@ -4,7 +4,7 @@ set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP} - "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC" + "-DCMAKE_C_FLAGS:STRING=-fPIC" -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) if(MSVC) @@ -16,24 +16,16 @@ if(MSVC) -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} ${BUILD_TYPE_STRING} - "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1}" # Make sure we use the same generator, otherwise we may # accidentally end up using different MSVC runtimes -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) endif() ExternalProject_Add(msgpack - PREFIX ${DEPS_BUILD_DIR} URL ${MSGPACK_URL} + URL_HASH SHA256=${MSGPACK_SHA256} + DOWNLOAD_NO_PROGRESS TRUE DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack - DOWNLOAD_COMMAND ${CMAKE_COMMAND} - -DPREFIX=${DEPS_BUILD_DIR} - -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/msgpack - -DURL=${MSGPACK_URL} - -DEXPECTED_SHA256=${MSGPACK_SHA256} - -DTARGET=msgpack - -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake CONFIGURE_COMMAND "${MSGPACK_CONFIGURE_COMMAND}" BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG> INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG> |