diff options
| author | Hans Wennborg <hans@hanshq.net> | 2013-12-05 17:49:58 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2013-12-05 17:49:58 +0000 |
| commit | 6a3816a66ff03a2d133a8f6f72a05d566dc26a67 (patch) | |
| tree | b81f958e2a1410f9cd228ac03776bdebffe7163b | |
| parent | 52937abc8bc1accdc1b3e0fffa268c39c8e1ed8d (diff) | |
| download | bcm5719-llvm-6a3816a66ff03a2d133a8f6f72a05d566dc26a67.tar.gz bcm5719-llvm-6a3816a66ff03a2d133a8f6f72a05d566dc26a67.zip | |
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
| -rw-r--r-- | clang/tools/clang-format-vs/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/tools/clang-format-vs/CMakeLists.txt b/clang/tools/clang-format-vs/CMakeLists.txt index f38213f0e36..f883a986e5f 100644 --- a/clang/tools/clang-format-vs/CMakeLists.txt +++ b/clang/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() |
