diff options
| author | Thomas Lamprecht <t.lamprecht@proxmox.com> | 2017-06-01 14:47:46 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-07-17 18:58:37 -0500 |
| commit | f2dce827f55a9b76ca7b2fc60b976b4760fc9eb1 (patch) | |
| tree | 31999d6e5625c6445dc39d7bafd357cce890b176 /qga | |
| parent | 009f38d9858d4338ccaaef787a5d54fd1c4c9198 (diff) | |
| download | qemu-f2dce827f55a9b76ca7b2fc60b976b4760fc9eb1.tar.gz | |
qemu-ga: add missing libpcre to MSI build
glib depends on libpcre which was not shipped with the MSI, thus
starting of the qemu-ga.exe failed with the respective error message.
Tell WIXL to ship this library with the MSI to avoid this problem.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
CC: Stefan Weil <sw@weilnetz.de>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/installer/qemu-ga.wxs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index fa2260cafa..5af11627f8 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -125,6 +125,9 @@ <Component Id="libwinpthread" Guid="{6C117C78-0F47-4B07-8F34-6BEE11643829}"> <File Id="libwinpthread_1.dll" Name="libwinpthread-1.dll" Source="$(var.Mingw_bin)/libwinpthread-1.dll" KeyPath="yes" DiskId="1"/> </Component> + <Component Id="libpcre" Guid="{7A86B45E-A009-489A-A849-CE3BACF03CD0}"> + <File Id="libpcre_1.dll" Name="libpcre-1.dll" Source="$(var.Mingw_bin)/libpcre-1.dll" KeyPath="yes" DiskId="1"/> + </Component> <Component Id="registry_entries" Guid="{D075D109-51CA-11E3-9F8B-000C29858960}"> <RegistryKey Root="HKLM" Key="Software\$(env.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\QemuGA"> @@ -173,6 +176,7 @@ <ComponentRef Id="libssp" /> <ComponentRef Id="libwinpthread" /> <ComponentRef Id="registry_entries" /> + <ComponentRef Id="libpcre" /> </Feature> <InstallExecuteSequence> |