[CMAKE] Fix host tools dependency tracking
authorJérôme Gardou <jerome.gardou@reactos.org>
Fri, 20 Nov 2020 18:54:54 +0000 (19:54 +0100)
committerJérôme Gardou <jerome.gardou@reactos.org>
Fri, 20 Nov 2020 18:57:48 +0000 (19:57 +0100)
sdk/cmake/host-tools.cmake

index dedcb11..08e91da 100644 (file)
@@ -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()