ENH: Improve default initialization of Slicer_CPACK_NSIS_INSTALL_ROOT #1155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If Slicer_CPACK_NSIS_INSTALL_REQUIRES_ADMIN_ACCOUNT is ON, the variable Slicer_CPACK_NSIS_INSTALL_ROOT is initialized with "$PROGRAMFILES64 or $PROGRAMFILES as it was done before r28293 (ENH: Allow Slicer install on Windows for non-admin users)
|
Closing without integrating, requiring custom application to explicitly set @lassoan Let me know if you think otherwise |
lassoan
reviewed
Jun 19, 2019
| if(NOT DEFINED Slicer_CPACK_NSIS_INSTALL_ROOT) | ||
| # Set root install directory (displayed to end user at installer-run time) | ||
| # to C:\Users\<username>\AppData\Local by default to allow installation | ||
| # without having administrative privileges. | ||
| set(Slicer_CPACK_NSIS_INSTALL_ROOT "$LOCALAPPDATA\\\\${Slicer_ORGANIZATION_NAME}" CACHE STRING | ||
| set(_install_root_default "$LOCALAPPDATA\\\\${Slicer_ORGANIZATION_NAME}") |
There was a problem hiding this comment.
Looks good. It would be a bit more readable like this:
# Set default install directory (displayed to end user during installation)
if(Slicer_CPACK_NSIS_INSTALL_REQUIRES_ADMIN_ACCOUNT)
# User has administrative privileges, therefore we can install to shared folder
# "C:\Program Files" or "c:\Program Files (x86)".
if(CMAKE_CL_64)
set(_install_root_default "$PROGRAMFILES64")
else()
set(_install_root_default "$PROGRAMFILES")
endif()
else()
# We do not require administrative privileges, therefore we install to user folder
# "C:\Users\<username>\AppData\Local".
set(_install_root_default "$LOCALAPPDATA\\\\${Slicer_ORGANIZATION_NAME}")
endif()
|
Thanks for the feedback. I ended up incorporating your suggestion and integrating as r28313 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If Slicer_CPACK_NSIS_INSTALL_REQUIRES_ADMIN_ACCOUNT is ON, the variable
Slicer_CPACK_NSIS_INSTALL_ROOT is initialized with "$PROGRAMFILES64 or $PROGRAMFILES
as it was done before r28293 (ENH: Allow Slicer install on Windows for non-admin users)