diff options
| author | b-r-o-c-k <brockmammen@gmail.com> | 2018-03-01 22:56:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 22:56:59 -0600 |
| commit | de3a833ec73cda093df918b8b079df116c42f91c (patch) | |
| tree | f9063874a476ca3a09a0321996a92db741ad47d0 /third-party/cmake | |
| parent | adfad73d8eb868b7b4691319c1f586f601f6815f (diff) | |
| parent | 3d2f4154b1d5d0bb063951c830e009505bdce359 (diff) | |
| download | rneovim-de3a833ec73cda093df918b8b079df116c42f91c.tar.gz rneovim-de3a833ec73cda093df918b8b079df116c42f91c.tar.bz2 rneovim-de3a833ec73cda093df918b8b079df116c42f91c.zip | |
Merge branch 'master' into msvc-compat
Diffstat (limited to 'third-party/cmake')
| -rw-r--r-- | third-party/cmake/BuildLibtermkey.cmake | 1 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibvterm.cmake | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/third-party/cmake/BuildLibtermkey.cmake b/third-party/cmake/BuildLibtermkey.cmake index 9081e5e988..6692f16f13 100644 --- a/third-party/cmake/BuildLibtermkey.cmake +++ b/third-party/cmake/BuildLibtermkey.cmake @@ -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() diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake index 1b95007cf2..5fb077e972 100644 --- a/third-party/cmake/BuildLibvterm.cmake +++ b/third-party/cmake/BuildLibvterm.cmake @@ -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} |