mirror of
https://github.com/neovim/neovim.git
synced 2025-09-06 11:28:22 +00:00
4c5c6ca800
* build: various cmake refactors and simplifications - Add STATUS keyword to message to ensure messages are shown in the correct order. - Remove DEPS_CXX_COMPILER as we don't rely on C++ for any of our dependencies. - Simplify how msgpack and luv configure options are constructed. - Rely on the default installation for luv instead of manually passing configure, build and install commands. - Simplify return code conditional. * build: remove CMAKE_OSX_ARCHITECTURES_ALT_SEP workaround CMAKE_OSX_ARCHITECTURES_ALT_SEP was defined as a workaround to prevent the shell from interpreting `;`, which CMake uses as a list separator. However, the same thing can be achieved by instead passing CMAKE_OSX_ARCHITECTURES as a cache variable instead, which is a more idiomatic way of achieving the same thing. * build: define CMAKE_BUILD_TYPE before adding it to BUILD_TYPE_STRING The problem with the current setup is that CMAKE_BUILD_TYPE is defined after BUILD_TYPE_STRING. BUILD_TYPE_STRING will then be empty on the first run, meaning that dependencies are built without a build type. However, since CMAKE_BUILD_TYPE is a cache variable its value will persist in subsequent runs. On the second run BUILD_TYPE_STRING will have the correct value, but it's a different value from the ones the dependencies were built with. This will force some dependencies to be built again. Fixes https://github.com/neovim/neovim/issues/21672.
28 lines
765 B
CMake
28 lines
765 B
CMake
set(MSGPACK_CMAKE_ARGS
|
|
-DMSGPACK_BUILD_TESTS=OFF
|
|
-DMSGPACK_BUILD_EXAMPLES=OFF
|
|
-DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
|
|
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
|
-DCMAKE_GENERATOR=${CMAKE_GENERATOR}
|
|
-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
|
|
${BUILD_TYPE_STRING})
|
|
|
|
if(NOT MSVC)
|
|
list(APPEND MSGPACK_CMAKE_ARGS
|
|
"-DCMAKE_C_FLAGS:STRING=-fPIC")
|
|
endif()
|
|
|
|
if(USE_EXISTING_SRC_DIR)
|
|
unset(MSGPACK_URL)
|
|
endif()
|
|
ExternalProject_Add(msgpack
|
|
URL ${MSGPACK_URL}
|
|
URL_HASH SHA256=${MSGPACK_SHA256}
|
|
DOWNLOAD_NO_PROGRESS TRUE
|
|
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack
|
|
CMAKE_ARGS "${MSGPACK_CMAKE_ARGS}"
|
|
CMAKE_CACHE_ARGS
|
|
-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES})
|
|
|
|
list(APPEND THIRD_PARTY_DEPS msgpack)
|