Revision: 69008
http://sourceforge.net/p/brlcad/code/69008
Author: starseeker
Date: 2016-10-08 17:16:52 +0000 (Sat, 08 Oct 2016)
Log Message:
-----------
Try to improve the default NSIS behavior for 32 vs. 64 bit builds.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2016-10-08 16:54:18 UTC (rev 69007)
+++ brlcad/trunk/CMakeLists.txt 2016-10-08 17:16:52 UTC (rev 69008)
@@ -3042,8 +3042,14 @@
endif(BRLCAD_ENABLE_WIX)
if(CMAKE_CL_64)
set(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_win64")
+ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}
${CPACK_PACKAGE_VERSION} win64")
+ # Use the setting from
http://public.kitware.com/pipermail/cmake/2013-June/055000.html to
+ # provide the correct default 64 bit directory with older CMake versions
+ set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
else(CMAKE_CL_64)
set(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_win32")
+ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}
${CPACK_PACKAGE_VERSION} win32")
+ set(CPACK_NSIS_PACKAGE_NAME "BRL-CAD (32 Bit)")
endif(CMAKE_CL_64)
endif(WIN32)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
