mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-28 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1033 'Automatic dependency rebuilding: Pass CMAKE_C_COMPILER_ARG1 to deps building.'

Browse Source
This commit is contained in:
John Szakmeister
2014-09-11 06:13:17 -04:00
parent 1da3398095 dd27c30687
commit 053a13d2a4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
third-party/CMakeLists.txt vendored
View File

@@ -43,6 +43,7 @@ if(CMAKE_GENERATOR MATCHES "Makefiles")
set(MAKE_PRG "$(MAKE)") set(MAKE_PRG "$(MAKE)")
endif() endif()
set(DEPS_C_COMPILER "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")
include(ExternalProject) include(ExternalProject)
@@ -73,7 +74,7 @@ if(USE_BUNDLED_LIBUV)
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh && CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh &&
${DEPS_BUILD_DIR}/src/libuv/configure --with-pic --disable-shared ${DEPS_BUILD_DIR}/src/libuv/configure --with-pic --disable-shared
--prefix=${DEPS_INSTALL_DIR} CC=${CMAKE_C_COMPILER} --prefix=${DEPS_INSTALL_DIR} CC=${DEPS_C_COMPILER}
INSTALL_COMMAND ${MAKE_PRG} install) INSTALL_COMMAND ${MAKE_PRG} install)
list(APPEND THIRD_PARTY_DEPS libuv) list(APPEND THIRD_PARTY_DEPS libuv)
endif() endif()
@@ -92,7 +93,7 @@ if(USE_BUNDLED_MSGPACK)
-DTARGET=msgpack -DTARGET=msgpack
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/msgpack/configure --disable-shared CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/msgpack/configure --disable-shared
--with-pic --prefix=${DEPS_INSTALL_DIR} CC=${CMAKE_C_COMPILER} --with-pic --prefix=${DEPS_INSTALL_DIR} CC=${DEPS_C_COMPILER}
INSTALL_COMMAND ${MAKE_PRG} install) INSTALL_COMMAND ${MAKE_PRG} install)
list(APPEND THIRD_PARTY_DEPS msgpack) list(APPEND THIRD_PARTY_DEPS msgpack)
endif() endif()
@@ -113,7 +114,7 @@ if(USE_BUNDLED_LUAJIT)
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}
CFLAGS=-fPIC CFLAGS=-fPIC
BUILDMODE=static BUILDMODE=static
@@ -151,7 +152,8 @@ if(USE_BUNDLED_LUAROCKS)
endif() endif()
add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install busted 1.10.0 COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build busted 1.10.0 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
DEPENDS luarocks) DEPENDS luarocks)
add_custom_target(busted add_custom_target(busted
DEPENDS ${DEPS_BIN_DIR}/busted) DEPENDS ${DEPS_BIN_DIR}/busted)
@@ -160,14 +162,16 @@ if(USE_BUNDLED_LUAROCKS)
# instances running in parallel. So we depend on busted to force it # instances running in parallel. So we depend on busted to force it
# to be serialized. # to be serialized.
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lua-cmsgpack COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build lua-cmsgpack CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
DEPENDS busted) DEPENDS busted)
add_custom_target(lua-cmsgpack add_custom_target(lua-cmsgpack
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack)
# Like before, depend on cmsgpack to ensure serialization of install commands # Like before, depend on cmsgpack to ensure serialization of install commands
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lpeg COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build lpeg CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
DEPENDS lua-cmsgpack) DEPENDS lua-cmsgpack)
add_custom_target(lpeg add_custom_target(lpeg
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg)