summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorManuel Klimek <klimek@google.com>2015-05-12 14:41:39 +0000
committerManuel Klimek <klimek@google.com>2015-05-12 14:41:39 +0000
commit53515ee97c8699f87639a6eefa7ff5d4a9546a5a (patch)
tree8abeba30c1f012093a4e9d7965eb26be8cf84616 /tools
parent469fd6d23d1844bb9918349df1b05de262f3f656 (diff)
downloadclang-53515ee97c8699f87639a6eefa7ff5d4a9546a5a.tar.gz
Fix clang-format build from the solution; the underlying path has changed to include the VS directory structure.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237136 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/clang-format-vs/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/clang-format-vs/CMakeLists.txt b/tools/clang-format-vs/CMakeLists.txt
index 0a50a6a8c4..fd0d6b028c 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}/${CMAKE_CFG_INTDIR}/clang-format.exe"
+ "${LLVM_TOOLS_BINARY_DIR}/clang-format.exe"
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/clang-format.exe"
DEPENDS clang-format)
@@ -23,6 +23,6 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN)
DEPENDS clang_format_exe_for_vsix "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/source.extension.vsixmanifest"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/bin/Release/ClangFormat.vsix"
- "${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ClangFormat.vsix"
+ "${LLVM_TOOLS_BINARY_DIR}/ClangFormat.vsix"
DEPENDS clang_format_exe_for_vsix clang_format_license)
endif()