diff options
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) |