Merge branch 'master' into msvc-compat

This commit is contained in:
b-r-o-c-k
2018-03-01 22:56:59 -06:00
committed by GitHub
4 changed files with 31 additions and 8 deletions

View File

@@ -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()

View File

@@ -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}