https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1bf3aae5082d06ffac04b2a747e60b4ef42d382
commit b1bf3aae5082d06ffac04b2a747e60b4ef42d382 Author: Mark Jansen <[email protected]> AuthorDate: Thu Jan 7 23:48:01 2021 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Fri Jan 8 21:12:11 2021 +0100 [CMAKE] Fix host-tools path for MSVC IDE --- sdk/cmake/host-tools.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 08e91da0216..a738ff64c09 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -9,6 +9,9 @@ function(setup_host_tools) list(TRANSFORM HOST_TOOLS PREPEND "${REACTOS_BINARY_DIR}/host-tools/bin/" OUTPUT_VARIABLE HOST_TOOLS_OUTPUT) if (CMAKE_HOST_WIN32) list(TRANSFORM HOST_TOOLS_OUTPUT APPEND ".exe") + if(MSVC_IDE) + set(HOST_EXTRA_DIR "$(ConfigurationName)/") + endif() set(HOST_EXE_SUFFIX ".exe") endif() @@ -26,7 +29,7 @@ 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 ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) + set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_tool}${HOST_EXE_SUFFIX}) + add_dependencies(native-${_tool} host-tools ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_tool}${HOST_EXE_SUFFIX}) endforeach() endfunction()
