diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-12-06 07:54:59 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-12-06 07:54:59 -0300 |
| commit | f76df2475356add68212d737acd7da5bba3b64d6 (patch) | |
| tree | 6781596a23402807bc9924f0045db03dbb7ec9e0 | |
| parent | 3b435621a55ffada58f9c2c991c61fc50b358c01 (diff) | |
| download | rneovim-f76df2475356add68212d737acd7da5bba3b64d6.tar.gz rneovim-f76df2475356add68212d737acd7da5bba3b64d6.tar.bz2 rneovim-f76df2475356add68212d737acd7da5bba3b64d6.zip | |
deps: Fix 32-bit build of lib{unibilium,termkey,tickit}
| -rw-r--r-- | third-party/CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 8f1b12213d..859be62adb 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -97,9 +97,10 @@ if(USE_BUNDLED_LIBUNIBILIUM) -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} + BUILD_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} - CFLAGS=-fPIC + CFLAGS+=${CMAKE_C_COMPILER_ARG1} + CFLAGS+=-fPIC INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install) list(APPEND THIRD_PARTY_DEPS libunibilium) endif() @@ -120,10 +121,11 @@ if(USE_BUNDLED_LIBTERMKEY) CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS=-fPIC + CFLAGS+=${CMAKE_C_COMPILER_ARG1} + CFLAGS+=-fPIC install) list(APPEND THIRD_PARTY_DEPS libtermkey) add_dependencies(libtermkey libunibilium) @@ -145,10 +147,11 @@ if(USE_BUNDLED_LIBTICKIT) CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS=-fPIC + CFLAGS+=${CMAKE_C_COMPILER_ARG1} + CFLAGS+=-fPIC install) list(APPEND THIRD_PARTY_DEPS libtickit) add_dependencies(libtickit libtermkey) |