Revision: 77040
http://sourceforge.net/p/brlcad/code/77040
Author: starseeker
Date: 2020-09-03 17:36:11 +0000 (Thu, 03 Sep 2020)
Log Message:
-----------
See if we can point to the CMake standard built-in template and get the same
installer as leaving the template unset.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/misc/CMake/WIX.template.in
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-09-03 17:22:47 UTC (rev 77039)
+++ brlcad/trunk/CMakeLists.txt 2020-09-03 17:36:11 UTC (rev 77040)
@@ -3593,6 +3593,7 @@
# custom WiX template option CPACK_WIX_TEMPLATE to match features with
# the NSIS installer.
set(CPACK_GENERATOR ${CPACK_GENERATOR} WIX)
+ set(CPACK_WIX_TEMPLATE "${BRLCAD_CMAKE_DIR}/WIX.template.in")
set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/misc/wix/License.rtf")
set(CPACK_WIX_PRODUCT_ICON
"${CMAKE_SOURCE_DIR}/misc/wix/brlcad_product.ico")
set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/misc/wix/brlcad_banner.bmp")
Modified: brlcad/trunk/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMake/CMakeLists.txt 2020-09-03 17:22:47 UTC (rev
77039)
+++ brlcad/trunk/misc/CMake/CMakeLists.txt 2020-09-03 17:36:11 UTC (rev
77040)
@@ -53,6 +53,7 @@
FindXSLTPROC.cmake
NSIS.template.in
NSIS_silent.template.in
+ WIX.template.in
OpenVDBUtils.cmake
Path_Setup.cmake
RPath_Setup.cmake
Added: brlcad/trunk/misc/CMake/WIX.template.in
===================================================================
--- brlcad/trunk/misc/CMake/WIX.template.in (rev 0)
+++ brlcad/trunk/misc/CMake/WIX.template.in 2020-09-03 17:36:11 UTC (rev
77040)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?include "cpack_variables.wxi"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";
@CPACK_WIX_CUSTOM_XMLNS_EXPANDED@
+ RequiredVersion="3.6.3303.0">
+
+ <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
+ Name="$(var.CPACK_PACKAGE_NAME)"
+ Language="1033"
+ Version="$(var.CPACK_PACKAGE_VERSION)"
+ Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
+ UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
+
+ <Package InstallerVersion="301" Compressed="yes"/>
+
+ <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
+
+ <MajorUpgrade
+ Schedule="afterInstallInitialize"
+ AllowSameVersionUpgrades="yes"
+ DowngradeErrorMessage="A later version of [ProductName] is already
installed. Setup will now exit."/>
+
+ <WixVariable Id="WixUILicenseRtf"
Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
+
+ <?ifdef CPACK_WIX_PRODUCT_ICON?>
+ <Property Id="ARPPRODUCTICON">ProductIcon.ico</Property>
+ <Icon Id="ProductIcon.ico" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/>
+ <?endif?>
+
+ <?ifdef CPACK_WIX_UI_BANNER?>
+ <WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/>
+ <?endif?>
+
+ <?ifdef CPACK_WIX_UI_DIALOG?>
+ <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/>
+ <?endif?>
+
+ <FeatureRef Id="ProductFeature"/>
+
+ <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
+
+ <?include "properties.wxi"?>
+ <?include "product_fragment.wxi"?>
+ </Product>
+</Wix>
Property changes on: brlcad/trunk/misc/CMake/WIX.template.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
