diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/clang-format-vs/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tools/clang-format-vs/source.extension.vsixmanifest.in (renamed from tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest) | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tools/clang-format-vs/CMakeLists.txt b/tools/clang-format-vs/CMakeLists.txt index f883a986e5..b1101928aa 100644 --- a/tools/clang-format-vs/CMakeLists.txt +++ b/tools/clang-format-vs/CMakeLists.txt @@ -6,9 +6,16 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN) "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/clang-format.exe" DEPENDS clang-format) + if (NOT CLANG_FORMAT_VS_VERSION) + set(CLANG_FORMAT_VS_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}") + endif() + + configure_file("source.extension.vsixmanifest.in" + "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/source.extension.vsixmanifest") + add_custom_target(clang_format_vsix ALL devenv "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat.sln" /Build Release - DEPENDS clang_format_exe_for_vsix + 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" diff --git a/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest b/tools/clang-format-vs/source.extension.vsixmanifest.in index 39d30f0f15..ed0e72e355 100644 --- a/tools/clang-format-vs/ClangFormat/source.extension.vsixmanifest +++ b/tools/clang-format-vs/source.extension.vsixmanifest.in @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?>
-<Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
+<Vsix Version="1.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
<Identifier Id="20dbc914-1c7a-4992-b236-ef58b37850eb">
<Name>ClangFormat</Name>
<Author>LLVM</Author>
- <Version>1.0</Version>
- <Description xml:space="preserve">Information about my package</Description>
+ <Version>@CLANG_FORMAT_VS_VERSION@</Version>
+ <Description xml:space="preserve">A tool to format C/C++/Obj-C code.</Description>
<Locale>1033</Locale>
<InstalledByMsi>false</InstalledByMsi>
<SupportedProducts>
|