Revision: 77044
http://sourceforge.net/p/brlcad/code/77044
Author: starseeker
Date: 2020-09-03 21:49:28 +0000 (Thu, 03 Sep 2020)
Log Message:
-----------
CPACK_START_MENU_SHORTCUTS may let us get the menu set up without a custom
template.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/misc/CMake/WIX.template.in
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-09-03 19:49:58 UTC (rev 77043)
+++ brlcad/trunk/CMakeLists.txt 2020-09-03 21:49:28 UTC (rev 77044)
@@ -3596,7 +3596,6 @@
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_PROGRAM_MENU_FOLDER "BRL-CAD ${BRLCAD_VERSION}")
- set(CPACK_WIX_TEMPLATE "${BRLCAD_CMAKE_DIR}/WIX.template.in")
set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/misc/wix/brlcad_banner.bmp")
set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/misc/wix/brlcad_dialog.bmp")
endif (Wix_FOUND)
Modified: brlcad/trunk/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMake/CMakeLists.txt 2020-09-03 19:49:58 UTC (rev
77043)
+++ brlcad/trunk/misc/CMake/CMakeLists.txt 2020-09-03 21:49:28 UTC (rev
77044)
@@ -53,7 +53,6 @@
FindXSLTPROC.cmake
NSIS.template.in
NSIS_silent.template.in
- WIX.template.in
OpenVDBUtils.cmake
Path_Setup.cmake
RPath_Setup.cmake
Deleted: brlcad/trunk/misc/CMake/WIX.template.in
===================================================================
--- brlcad/trunk/misc/CMake/WIX.template.in 2020-09-03 19:49:58 UTC (rev
77043)
+++ brlcad/trunk/misc/CMake/WIX.template.in 2020-09-03 21:49:28 UTC (rev
77044)
@@ -1,47 +0,0 @@
-<?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>
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
