IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "deps: Fix 32-bit build of lib{unibilium,termkey,tickit}"

Browse Source 
This reverts commit f76df24753.
This commit is contained in:
Thiago de Arruda 2014-12-06 09:15:53 -03:00
parent 33530ac9a4
commit f1a934808a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
third-party/CMakeLists.txt vendored
View File

@ -97,10 +97,9 @@ if(USE_BUNDLED_LIBUNIBILIUM)
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
PREFIX=${DEPS_INSTALL_DIR} PREFIX=${DEPS_INSTALL_DIR}
CFLAGS+=${CMAKE_C_COMPILER_ARG1} CFLAGS=-fPIC
CFLAGS+=-fPIC
INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install) INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install)
list(APPEND THIRD_PARTY_DEPS libunibilium) list(APPEND THIRD_PARTY_DEPS libunibilium)
endif() endif()
@ -121,11 +120,10 @@ if(USE_BUNDLED_LIBTERMKEY)
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
PREFIX=${DEPS_INSTALL_DIR} PREFIX=${DEPS_INSTALL_DIR}
PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
CFLAGS+=${CMAKE_C_COMPILER_ARG1} CFLAGS=-fPIC
CFLAGS+=-fPIC
install) install)
list(APPEND THIRD_PARTY_DEPS libtermkey) list(APPEND THIRD_PARTY_DEPS libtermkey)
add_dependencies(libtermkey libunibilium) add_dependencies(libtermkey libunibilium)
@ -147,11 +145,10 @@ if(USE_BUNDLED_LIBTICKIT)
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
PREFIX=${DEPS_INSTALL_DIR} PREFIX=${DEPS_INSTALL_DIR}
PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
CFLAGS+=${CMAKE_C_COMPILER_ARG1} CFLAGS=-fPIC
CFLAGS+=-fPIC
install) install)
list(APPEND THIRD_PARTY_DEPS libtickit) list(APPEND THIRD_PARTY_DEPS libtickit)
add_dependencies(libtickit libtermkey) add_dependencies(libtickit libtermkey)