retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1698 in FS/freeswitch from ~ANDYWOLK/freeswitch:bugfix/FS-11729-wix-project-fails-to-find-mergemodule-folder-due-to-incorrect-version-in-path-fixed to master 

* commit 'a8aced2411687f677d8b317937e6497c1bce8677':
  FS-11729: [Build-System] Fix Visual Studio 2017 15.9 Redist files detection.
This commit is contained in:
Mike Jerris 2019-04-01 16:18:58 -05:00
parent 13fe6ee962 a8aced2411
commit 4dbb8f27ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
w32/Setup/Setup.2017.wixproj
View File

@ -928,7 +928,10 @@
<CreateProperty Condition="$(FullVersion) != ''" Value="$(SolutionDir)$(UserFriendlyPlatform)\$(OutputName)-$(FullVersion)$(Revision)$(SnapshotName)-$(UserFriendlyPlatform)-$(Configuration).msi">
<Output TaskParameter="Value" PropertyName="DestinationFileName" />
</CreateProperty>
<CreateProperty Value="$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Major).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Minor).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Bld)">
<CreateProperty Value="$(VCToolsRedistVersion)">
<Output TaskParameter="Value" PropertyName="VCLibVersion" />
</CreateProperty>
<CreateProperty Condition="'$(VCLibVersion)' == ''" Value="$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Major).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Minor).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Bld)">
<Output TaskParameter="Value" PropertyName="VCLibVersion" />
</CreateProperty>
<CreateProperty Value="$(VSInstallDir)\VC\Redist\MSVC\$(VCLibVersion)\MergeModules\">