[ros-diffs] [reactos] 01/02: [CMAKE] Fix host tools dependency tracking

[Jérôme Gardou]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72d94714241006190741e4...

commit 72d94714241006190741e47ecc9020503d977d37
Author:     Jérôme Gardou [e-mail]
AuthorDate: Fri Nov 20 19:54:54 2020 +0100
Commit:     Jérôme Gardou [e-mail]
CommitDate: Fri Nov 20 19:57:48 2020 +0100

[CMAKE] Fix host tools dependency tracking
---
 sdk/cmake/host-tools.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake
index dedcb11a4c5..08e91da0216 100644
--- a/sdk/cmake/host-tools.cmake
+++ b/sdk/cmake/host-tools.cmake
@@ -15,9 +15,10 @@ function(setup_host_tools)
     ExternalProject_Add(host-tools
         SOURCE_DIR ${REACTOS_SOURCE_DIR}
         PREFIX ${REACTOS_BINARY_DIR}/host-tools
-        INSTALL_DIR ${REACTOS_BINARY_DIR}/host-tools
-        CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools
+        BINARY_DIR ${REACTOS_BINARY_DIR}/host-tools/bin
+        CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin
         BUILD_ALWAYS TRUE
+        INSTALL_COMMAND ${CMAKE_COMMAND} -E true
         BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT}
     )

@@ -26,6 +27,6 @@ function(setup_host_tools)
     foreach(_tool ${HOST_TOOLS})
         add_executable(native-${_tool} IMPORTED)
         set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX})
-        add_dependencies(native-${_tool} host-tools)
+        add_dependencies(native-${_tool} host-tools ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX})
     endforeach()
 endfunction()