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

Merge pull request #1173 from jszakmeister/build-portability-fix

Browse Source 
third-party: avoid using `rm` in the install command

closes #1171
This commit is contained in:
Justin M. Keyes 2014-09-14 16:23:10 -04:00
commit 53ef7038d8
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
third-party/CMakeLists.txt vendored
View File

@ -99,11 +99,10 @@ if(USE_BUNDLED_MSGPACK)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC" "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC"
BUILD_COMMAND ${MAKE_PRG} BUILD_COMMAND ${MAKE_PRG}
INSTALL_COMMAND ${MAKE_PRG} install && INSTALL_COMMAND ${CMAKE_COMMAND}
rm ${DEPS_INSTALL_DIR}/lib/libmsgpack.so && -DMAKE_PRG=${MAKE_PRG}
rm ${DEPS_INSTALL_DIR}/lib/libmsgpack.so.3 && -DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}msgpack*${CMAKE_SHARED_LIBRARY_SUFFIX}*
rm ${DEPS_INSTALL_DIR}/lib/libmsgpack.so.4.0.0 -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InstallMsgpack.cmake)
)
list(APPEND THIRD_PARTY_DEPS msgpack) list(APPEND THIRD_PARTY_DEPS msgpack)
endif() endif()

12
third-party/cmake/InstallMsgpack.cmake vendored Normal file
View File

@ -0,0 +1,12 @@
execute_process(
COMMAND ${MAKE_PRG} install
RESULT_VARIABLE res)
if(NOT res EQUAL 0)
message(FATAL_ERROR "Installing msgpack failed.")
endif()
file(GLOB FILES_TO_REMOVE ${REMOVE_FILE_GLOB})
if(FILES_TO_REMOVE)
file(REMOVE ${FILES_TO_REMOVE})
endif()