build: rely on default cmake installation if possible

The default cmake installation process for dependencies that use cmake
on all platforms is in general more robust and less verbose, so we rely
on that if possible.

3 files changed, 19 insertions, 26 deletions

diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index aecd5da626..4ba1f46d2e 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -7,18 +7,16 @@ if(MSVC)
     URL_HASH SHA256=${GETTEXT_SHA256}
     DOWNLOAD_NO_PROGRESS TRUE
     DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/gettext
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
-        ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
-      COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/gettext
-        -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-        ${BUILD_TYPE_STRING}
-        -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-        -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-        -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-        -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+      ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      ${BUILD_TYPE_STRING}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+      -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+      -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX})
 else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
diff --git a/cmake.deps/cmake/BuildLibiconv.cmake b/cmake.deps/cmake/BuildLibiconv.cmake
index 26d9b02e77..382aae3df7 100644
--- a/cmake.deps/cmake/BuildLibiconv.cmake
+++ b/cmake.deps/cmake/BuildLibiconv.cmake
@@ -7,16 +7,14 @@ if(MSVC)
     URL_HASH SHA256=${LIBICONV_SHA256}
     DOWNLOAD_NO_PROGRESS TRUE
     DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libiconv
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibiconvCMakeLists.txt
-        ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
-      COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libiconv
-        -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-        ${BUILD_TYPE_STRING}
-        -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-        -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+      ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      ${BUILD_TYPE_STRING}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM})
 else()
   message(FATAL_ERROR "Trying to build libiconv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake
index b59d98159d..3197ec45a1 100644
--- a/cmake.deps/cmake/BuildMsgpack.cmake
+++ b/cmake.deps/cmake/BuildMsgpack.cmake
@@ -1,4 +1,4 @@
-set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
+set(MSGPACK_CMAKE_ARGS
   -DMSGPACK_BUILD_TESTS=OFF
   -DMSGPACK_BUILD_EXAMPLES=OFF
   -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
@@ -8,8 +8,7 @@ set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
   -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
 
 if(MSVC)
-  # Same as Unix without fPIC
-  set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
+  set(MSGPACK_CMAKE_ARGS
     -DMSGPACK_BUILD_TESTS=OFF
     -DMSGPACK_BUILD_EXAMPLES=OFF
     -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
@@ -29,9 +28,7 @@ ExternalProject_Add(msgpack
   URL_HASH SHA256=${MSGPACK_SHA256}
   DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack
-  CONFIGURE_COMMAND "${MSGPACK_CONFIGURE_COMMAND}"
-  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>
+  CMAKE_ARGS "${MSGPACK_CMAKE_ARGS}"
   LIST_SEPARATOR |)
 
 list(APPEND THIRD_PARTY_DEPS msgpack)