From 4aabe4a0d58ca678fc4d33d6ece845c2eea0b781 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Mon, 22 Jul 2019 20:50:30 +0200 Subject: [PATCH] build: GetBinaryDeps: move include, fix doc (#10579) --- third-party/CMakeLists.txt | 4 ++-- third-party/cmake/GetBinaryDeps.cmake | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 768c89f922..6824e208aa 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -237,9 +237,9 @@ if(USE_BUNDLED_LIBICONV) include(BuildLibiconv) endif() -include(GetBinaryDeps) - if(WIN32) + include(GetBinaryDeps) + GetBinaryDep(TARGET wintools INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory . ${DEPS_INSTALL_DIR}/bin) diff --git a/third-party/cmake/GetBinaryDeps.cmake b/third-party/cmake/GetBinaryDeps.cmake index 1d98177924..f262ae7159 100644 --- a/third-party/cmake/GetBinaryDeps.cmake +++ b/third-party/cmake/GetBinaryDeps.cmake @@ -2,9 +2,10 @@ include(CMakeParseArguments) # This is similar to the build recipes, but instead downloads a third party -# binary and installs it under the the DEPS_PREFIX. The INSTALL_COMMAND is -# executed in the folder where downloaded files are extracted and the -# ${DEPS_INSTALL_DIR} holds the path to the third-party install root. +# binary and installs it under the DEPS_PREFIX. +# The INSTALL_COMMAND is executed in the folder where downloaded files are +# extracted and the ${DEPS_INSTALL_DIR} holds the path to the third-party +# install root. function(GetBinaryDep) cmake_parse_arguments(_gettool "BUILD_IN_SOURCE"