[CMAKE] Fix host tools dependency tracking

This commit is contained in:
Jérôme Gardou 2020-11-20 19:54:54 +01:00
parent 059ba9b0c0
commit 72d9471424

View file

@ -15,9 +15,10 @@ function(setup_host_tools)
ExternalProject_Add(host-tools ExternalProject_Add(host-tools
SOURCE_DIR ${REACTOS_SOURCE_DIR} SOURCE_DIR ${REACTOS_SOURCE_DIR}
PREFIX ${REACTOS_BINARY_DIR}/host-tools PREFIX ${REACTOS_BINARY_DIR}/host-tools
INSTALL_DIR ${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 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 BUILD_ALWAYS TRUE
INSTALL_COMMAND ${CMAKE_COMMAND} -E true
BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT} BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT}
) )
@ -26,6 +27,6 @@ function(setup_host_tools)
foreach(_tool ${HOST_TOOLS}) foreach(_tool ${HOST_TOOLS})
add_executable(native-${_tool} IMPORTED) add_executable(native-${_tool} IMPORTED)
set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) 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() endforeach()
endfunction() endfunction()