mirror of
https://github.com/neovim/neovim.git
synced 2025-09-13 06:48:17 +00:00
Merge branch 'master' into msvc-compat
This commit is contained in:
1
third-party/cmake/BuildLibtermkey.cmake
vendored
1
third-party/cmake/BuildLibtermkey.cmake
vendored
@@ -43,6 +43,7 @@ ExternalProject_Add(libtermkey
|
||||
PREFIX=${DEPS_INSTALL_DIR}
|
||||
PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
|
||||
CFLAGS=-fPIC
|
||||
${DEFAULT_MAKE_CFLAGS}
|
||||
install)
|
||||
endif()
|
||||
|
||||
|
7
third-party/cmake/BuildLibvterm.cmake
vendored
7
third-party/cmake/BuildLibvterm.cmake
vendored
@@ -53,9 +53,10 @@ if(WIN32)
|
||||
set(LIBVTERM_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
|
||||
else()
|
||||
set(LIBVTERM_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
|
||||
PREFIX=${DEPS_INSTALL_DIR}
|
||||
CFLAGS=-fPIC
|
||||
install)
|
||||
PREFIX=${DEPS_INSTALL_DIR}
|
||||
CFLAGS=-fPIC
|
||||
${DEFAULT_MAKE_CFLAGS}
|
||||
install)
|
||||
endif()
|
||||
|
||||
BuildLibvterm(PATCH_COMMAND ${LIBVTERM_PATCH_COMMAND}
|
||||
|
Reference in New Issue
Block a user