From 355a05cafa07f954318e531c9c4d32cd9ceae24a Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 5 Dec 2013 17:49:58 +0000 Subject: [PATCH] clang-format vsix cmake build: use ${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR} as the location for grabbing clang-format.exe, and also output the .vsix here. This allows us to find clang-format.exe when building from a MSVC Solution. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196512 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-format-vs/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/clang-format-vs/CMakeLists.txt b/tools/clang-format-vs/CMakeLists.txt index f38213f0e3..f883a986e5 100644 --- a/tools/clang-format-vs/CMakeLists.txt +++ b/tools/clang-format-vs/CMakeLists.txt @@ -2,7 +2,7 @@ option(BUILD_CLANG_FORMAT_VS_PLUGIN "Build clang-format VS plugin" OFF) if (BUILD_CLANG_FORMAT_VS_PLUGIN) add_custom_target(clang_format_exe_for_vsix ${CMAKE_COMMAND} -E copy_if_different - "${LLVM_TOOLS_BINARY_DIR}/clang-format.exe" + "${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR}/clang-format.exe" "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/clang-format.exe" DEPENDS clang-format) @@ -11,6 +11,6 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN) DEPENDS clang_format_exe_for_vsix COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/bin/Release/ClangFormat.vsix" - "${LLVM_TOOLS_BINARY_DIR}/ClangFormat.vsix" + "${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ClangFormat.vsix" DEPENDS clang_format_exe_for_vsix) endif() -- 2.40.0