diff options
| author | Rui Abreu Ferreira <raf-ep@gmx.com> | 2014-11-14 14:35:16 +0000 |
|---|---|---|
| committer | Rui Abreu Ferreira <raf-ep@gmx.com> | 2014-11-14 14:35:16 +0000 |
| commit | 2b887ec66ba28f6d6fcbfdd121522fd7093bcc65 (patch) | |
| tree | eed711ff88f6ca00449c2eba620e2181b0e90638 /third-party | |
| parent | 8da78bc3ae694aa2a6edaac97756211374491471 (diff) | |
| download | rneovim-2b887ec66ba28f6d6fcbfdd121522fd7093bcc65.tar.gz rneovim-2b887ec66ba28f6d6fcbfdd121522fd7093bcc65.tar.bz2 rneovim-2b887ec66ba28f6d6fcbfdd121522fd7093bcc65.zip | |
Use cmake --build instead of Make
- If possble try to abstract away from Make, and use cmake --build
- third-party still needs to find Make to build some components
- Removed search for Make from CMakeLists.txt
* for CMake < 3.0 --build has no color output
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | third-party/cmake/InstallMsgpack.cmake | 2 |
2 files changed, 2 insertions, 3 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) diff --git a/third-party/cmake/InstallMsgpack.cmake b/third-party/cmake/InstallMsgpack.cmake index d5e5d7e816..eda77f3b84 100644 --- a/third-party/cmake/InstallMsgpack.cmake +++ b/third-party/cmake/InstallMsgpack.cmake @@ -1,5 +1,5 @@ execute_process( - COMMAND ${MAKE_PRG} install + COMMAND ${CMAKE_COMMAND} --build . --target install RESULT_VARIABLE res) if(NOT res EQUAL 0) |