Revision: 77047
http://sourceforge.net/p/brlcad/code/77047
Author: starseeker
Date: 2020-09-03 22:42:36 +0000 (Thu, 03 Sep 2020)
Log Message:
-----------
Note potentially relevant WiX example in CMake itself.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-09-03 22:08:52 UTC (rev 77046)
+++ brlcad/trunk/CMakeLists.txt 2020-09-03 22:42:36 UTC (rev 77047)
@@ -3588,13 +3588,16 @@
endif (NSIS_FOUND)
find_package(Wix)
if (Wix_FOUND)
- # TODO - user report that this version of the installer also supports
- # non-graphical installation with the /passive option - need to explore
- # custom WiX template option CPACK_WIX_TEMPLATE to match features with
- # the NSIS installer.
- # Note: for WiX, start menu shortcuts and desktop icons are handled with
properties
- # set on targets. (At the moment, this is not true for NSIS - it uses
entries
- # in the misc/CMake/NSIS.template.in file.)
+ # User report that this version of the installer also supports
+ # non-graphical installation with the /passive option.
+ #
+ # Note: for WiX, start menu shortcuts and desktop icons are handled with
+ # properties set on targets. (At the moment, this is not true for NSIS -
+ # it uses entries in the misc/CMake/NSIS.template.in file.)
+ #
+ # If we need to get fancier about this, look at the following:
+ #
https://github.com/Kitware/CMake/blob/master/CMakeCPackOptions.cmake.in#L216
+ # https://github.com/Kitware/CMake/tree/master/Utilities/Release/WiX
set(CPACK_GENERATOR ${CPACK_GENERATOR} WIX)
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")
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
