pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-31 20:04:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: use libvirt conditionally

Browse Source 
Only include libvirt as dep when it's explicitly done in the configure.
This commit is contained in:
Fabiano Fidêncio 2014-12-17 06:16:41 +01:00
parent dba01112e8
commit befd4608e4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/Makefile.am
View File

@ -16,6 +16,12 @@ all-local: adwaita-icons-needed.wxi virt-viewer.wxs virt-viewer.nsis virt-viewer
if OS_WIN32
if HAVE_LIBVIRT
HaveLibvirt = True
else
HaveLibvirt = False
endif
deps.txt:
$(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
@ -40,6 +46,7 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \
-D DESTDIR=$$DESTDIR$(prefix) \
-D GtkVersion=$(GTK_API_VERSION) \
-D HaveLibvirt=$(HaveLibvirt) \
--arch $(WIXL_ARCH) \
-o $@ \
$< virt-viewer-files.wxs && \

8
data/virt-viewer.wxs.in
View File

@ -24,7 +24,9 @@
<?require gtk-vnc2.wxi?>
<?require adwaita-icons-needed.wxi?>
<?endif?>
<?require libvirt.wxi?>
<?if $(var.HaveLibvirt) = "True"?>
<?require libvirt.wxi?>
<?endif?>
<?require libgovirt.wxi?>
<?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?>
@ -127,7 +129,9 @@
<ComponentGroupRef Id="CG.gtk-vnc2"/>
<ComponentGroupRef Id="CG.adwaita-icons-needed"/>
<?endif?>
<ComponentGroupRef Id="CG.libvirt"/>
<?if $(var.HaveLibvirt) = "True"?>
<ComponentGroupRef Id="CG.libvirt"/>
<?endif?>
<ComponentGroupRef Id="CG.libgovirt"/>
<ComponentGroupRef Id="CG.virt-viewer"/>
<ComponentRef Id="CDepsFile"/>