Revision: 77045
http://sourceforge.net/p/brlcad/code/77045
Author: starseeker
Date: 2020-09-03 22:06:51 +0000 (Thu, 03 Sep 2020)
Log Message:
-----------
Try setting the CPACK install properties.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/archer/CMakeLists.txt
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/rtwizard/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-09-03 21:49:28 UTC (rev 77044)
+++ brlcad/trunk/CMakeLists.txt 2020-09-03 22:06:51 UTC (rev 77045)
@@ -3592,6 +3592,9 @@
# 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.)
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")
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2020-09-03 21:49:28 UTC (rev
77044)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2020-09-03 22:06:51 UTC (rev
77045)
@@ -24,6 +24,14 @@
foreach(item ${tclindex_target_list})
add_dependencies(archer ${item})
endforeach(item ${tclindex_target_list})
+
+ # Archer is one of the programs that gets a start menu entry
+ set_property(INSTALL "bin/$<TARGET_FILE_NAME:archer>"
+ PROPERTY CPACK_START_MENU_SHORTCUTS "Archer ${BRLCAD_VERSION}"
+ )
+ set_property(INSTALL "bin/$<TARGET_FILE_NAME:archer>"
+ PROPERTY CPACK_DESKTOP_SHORTCUTS "Archer ${BRLCAD_VERSION}"
+ )
endif(BRLCAD_ENABLE_TK)
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-09-03 21:49:28 UTC (rev
77044)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-09-03 22:06:51 UTC (rev
77045)
@@ -82,6 +82,14 @@
add_dependencies(mged ${item})
endforeach(item ${tclindex_target_list})
+ # MGED is one of the programs that gets a start menu entry
+ set_property(INSTALL "bin/$<TARGET_FILE_NAME:mged>"
+ PROPERTY CPACK_START_MENU_SHORTCUTS "MGED ${BRLCAD_VERSION}"
+ )
+ set_property(INSTALL "bin/$<TARGET_FILE_NAME:mged>"
+ PROPERTY CPACK_DESKTOP_SHORTCUTS "MGED ${BRLCAD_VERSION}"
+ )
+
else (BRLCAD_ENABLE_TCL)
CMAKEFILES(${MGED_SOURCES})
Modified: brlcad/trunk/src/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-09-03 21:49:28 UTC (rev
77044)
+++ brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-09-03 22:06:51 UTC (rev
77045)
@@ -17,6 +17,15 @@
foreach(item ${tclindex_target_list})
add_dependencies(rtwizard ${item})
endforeach(item ${tclindex_target_list})
+
+ # RtWizard is one of the programs that gets a start menu entry
+ set_property(INSTALL "bin/$<TARGET_FILE_NAME:rtwizard>"
+ PROPERTY CPACK_START_MENU_SHORTCUTS "RtWizard ${BRLCAD_VERSION}"
+ )
+ set_property(INSTALL "bin/$<TARGET_FILE_NAME:rtwizard>"
+ PROPERTY CPACK_DESKTOP_SHORTCUTS "RtWizard ${BRLCAD_VERSION}"
+ )
+
endif (TARGET libtclcad)
CMAKEFILES(
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
