diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackIFW.cmake | 43 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 1 |
2 files changed, 40 insertions, 4 deletions
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index f99488a..1f6de8f 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -29,8 +29,37 @@ # Variables # ^^^^^^^^^ # -# Variables that Change Behavior -# """""""""""""""""""""""""""""" +# You can use the following variables to change behavior of CPack ``IFW`` generator. +# +# Package +# """"""" +# +# .. variable:: CPACK_IFW_PACKAGE_TITLE +# +# Name of the installer as displayed on the title bar. +# By default used :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` +# +# .. variable:: CPACK_IFW_PACKAGE_PUBLISHER +# +# Publisher of the software (as shown in the Windows Control Panel). +# By default used :variable:`CPACK_PACKAGE_VENDOR` +# +# .. variable:: CPACK_IFW_PRODUCT_URL +# +# URL to a page that contains product information on your web site. +# +# .. variable:: CPACK_IFW_PACKAGE_ICON +# +# Filename for a custom installer icon. The actual file is '.icns' (Mac OS X), +# '.ico' (Windows). No functionality on Unix. +# +# .. variable:: CPACK_IFW_PACKAGE_WINDOW_ICON +# +# Filename for a custom window icon in PNG format for the Installer application. +# +# .. variable:: CPACK_IFW_PACKAGE_LOGO +# +# Filename for a logo used as QWizard::LogoPixmap. # # .. variable:: CPACK_IFW_TARGET_DIRECTORY # @@ -45,6 +74,9 @@ # # You can use predefined variables. # +# Components +# """""""""" +# # .. variable:: CPACK_IFW_RESOLVE_DUPLICATE_NAMES # # Resolve duplicate names when installing components with groups. @@ -54,8 +86,8 @@ # Additional prepared packages dirs that will be used to resolve # dependent components. # -# Advanced Variables -# """""""""""""""""" +# Advanced +# """""""" # # .. variable:: CPACK_IFW_BINARYCREATOR_EXECUTABLE # @@ -95,6 +127,7 @@ # [SCRIPT <script>] # [NAME <name>] # [PRIORITY <priority>] +# [DEPENDS <com_id> ...] # [LICENSES <display_name> <file_path> ...]) # # This command should be called after cpack_add_component command. @@ -109,6 +142,8 @@ # # ``PRIORITY`` is priority of the component in the tree. # +# ``DEPENDS`` list of dependency component identifiers in QtIFW_ style. +# # ``LICENSES`` pair of <display_name> and <file_path> of license text for this # component. You can specify more then one license. # diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 2cfe6fe..e51c592 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -258,4 +258,5 @@ macro(__windows_compiler_msvc lang) set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") + set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON) endmacro() |