diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackWIX.cmake | 17 | ||||
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 10926c0..08ff0cb 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -248,6 +248,23 @@ # Sets the description of the root install feature in the WIX installer. Same as # CPACK_COMPONENT_<compName>_DESCRIPTION for components. # +# .. variable:: CPACK_WIX_SKIP_PROGRAM_FOLDER +# +# If this variable is set to true, the default install location +# of the generated package will be CPACK_PACKAGE_INSTALL_DIRECTORY directly. +# The install location will not be located relatively below +# ProgramFiles or ProgramFiles64. +# +# .. note:: +# Installers created with this feature do not take differences +# between the system on which the installer is created +# and the system on which the installer might be used into account. +# +# It is therefor possible that the installer e.g. might try to install +# onto a drive that is unavailable or unintended or a path that does not +# follow the localization or convention of the system on which the +# installation is performed. +# #============================================================================= # Copyright 2014-2015 Kitware, Inc. diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 322cbd3..2881e7f 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -753,7 +753,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa find_program(gp_grep_cmd grep) endif() if(gp_grep_cmd) - set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "^[[:blank:]]*DLL Name: ") + set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "-a" "^[[:blank:]]*DLL Name: ") endif() else() message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...") |