https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0341ea5e7bb96fd99b3e6c48b6afc931aaeb59a1
commit 0341ea5e7bb96fd99b3e6c48b6afc931aaeb59a1 Author: Andrew Cook <[email protected]> AuthorDate: Fri Feb 15 12:33:13 2019 +1100 Commit: Mark Jansen <[email protected]> CommitDate: Sat Aug 17 17:39:44 2019 +0200 Search for host-tools path Allows source-relative paths --- sdk/cmake/host-tools.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 41b82d29fac..04e58f7c7bb 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -48,7 +48,12 @@ function(setup_host_tools) if(WITH_HOST_TOOLS) # Use pre-built tools, required for cross compiling with msvc # as only one target architecture is available at a time - set(HOST_TOOLS_DIR ${WITH_HOST_TOOLS}) + find_path(HOST_TOOLS_DIR + NAMES ImportExecutables.cmake + HINTS ${WITH_HOST_TOOLS} ${REACTOS_SOURCE_DIR}/${WITH_HOST_TOOLS} + NO_CMAKE_PATH + NO_CMAKE_ENVIRONMENT_PATH) + message(STATUS "Using prebuilt host tools: ${HOST_TOOLS_DIR}") include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) else() # Build host-tools. Changes to tool sources will rebuild targets
