aboutsummaryrefslogtreecommitdiff
path: root/third-party/CMakeLists.txt
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-11-17 06:53:07 -0500
committerJohn Szakmeister <john@szakmeister.net>2014-11-17 06:53:07 -0500
commit3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb (patch)
tree23a59f73d997f0a227e8eb3b0d7c66b8e7bed293 /third-party/CMakeLists.txt
parentcdf85dcc12bf227b5f4831b2b58c0b11f743aedf (diff)
parent2b887ec66ba28f6d6fcbfdd121522fd7093bcc65 (diff)
downloadrneovim-3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb.tar.gz
rneovim-3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb.tar.bz2
rneovim-3b8661745b2c5ed8b4b9a7bfe4fa75935eb1afeb.zip
Merge pull request #1485 from equalsraf/tb-no-make-prg
Use cmake --build inside CMake scripts instead of calling Make directly
Diffstat (limited to 'third-party/CMakeLists.txt')
-rw-r--r--third-party/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 166d48785a..38c5533ddd 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -106,9 +106,8 @@ if(USE_BUNDLED_MSGPACK)
-DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC"
- BUILD_COMMAND ${MAKE_PRG}
+ BUILD_COMMAND ${CMAKE_COMMAND} --build .
INSTALL_COMMAND ${CMAKE_COMMAND}
- -DMAKE_PRG=${MAKE_PRG}
-DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}msgpack*${CMAKE_SHARED_LIBRARY_SUFFIX}*
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InstallMsgpack.cmake)
list(APPEND THIRD_PARTY_DEPS msgpack)