r237136 - Fix clang-format build from the solution; the underlying path has changed to include the VS directory structure.

[Manuel Klimek]

Author: klimek
Date: Tue May 12 09:41:39 2015
New Revision: 237136

URL: http://llvm.org/viewvc/llvm-project?rev=237136&view=rev
Log:
Fix clang-format build from the solution; the underlying path has changed to include the VS directory structure.

Modified:
    cfe/trunk/tools/clang-format-vs/CMakeLists.txt
    cfe/trunk/tools/clang-format-vs/ClangFormat/   (props changed)

Modified: cfe/trunk/tools/clang-format-vs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format-vs/CMakeLists.txt?rev=237136&r1=237135&r2=237136&view=diff
==============================================================================
--- cfe/trunk/tools/clang-format-vs/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-format-vs/CMakeLists.txt Tue May 12 09:41:39 2015
@@ -2,7 +2,7 @@ option(BUILD_CLANG_FORMAT_VS_PLUGIN "Bui
 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()

Propchange: cfe/trunk/tools/clang-format-vs/ClangFormat/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 12 09:41:39 2015
@@ -2,3 +2,6 @@ bin
 obj
 *.csproj.user
 Key.snk
+clang-format.exe
+license.txt
+source.extension.vsixmanifest