Skip to content

Commit 6a3816a

Browse files
committed
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. llvm-svn: 196512
1 parent 52937ab commit 6a3816a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

clang/tools/clang-format-vs/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ option(BUILD_CLANG_FORMAT_VS_PLUGIN "Build clang-format VS plugin" OFF)
22
if (BUILD_CLANG_FORMAT_VS_PLUGIN)
33
add_custom_target(clang_format_exe_for_vsix
44
${CMAKE_COMMAND} -E copy_if_different
5-
"${LLVM_TOOLS_BINARY_DIR}/clang-format.exe"
5+
"${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR}/clang-format.exe"
66
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/clang-format.exe"
77
DEPENDS clang-format)
88

@@ -11,6 +11,6 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN)
1111
DEPENDS clang_format_exe_for_vsix
1212
COMMAND ${CMAKE_COMMAND} -E copy_if_different
1313
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/bin/Release/ClangFormat.vsix"
14-
"${LLVM_TOOLS_BINARY_DIR}/ClangFormat.vsix"
14+
"${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ClangFormat.vsix"
1515
DEPENDS clang_format_exe_for_vsix)
1616
endif()

0 commit comments

Comments
 (0)