diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-06 18:33:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-06 18:33:21 (GMT) |
| commit | 242c14ddbd7804531ab8720aa818cacc67bcb4ed (patch) | |
| tree | 61ffe55ac9d232db4a5f7a52fbc59c6c58dd3f07 /Help/release/3.6.rst | |
| parent | bfdd1ba604a31b3bb9f0baa29ce6fce467ee2e47 (diff) | |
| parent | 12deb051b368afcec39f58f9e3beb1c702051e74 (diff) | |
| download | CMake-242c14ddbd7804531ab8720aa818cacc67bcb4ed.zip CMake-242c14ddbd7804531ab8720aa818cacc67bcb4ed.tar.gz CMake-242c14ddbd7804531ab8720aa818cacc67bcb4ed.tar.bz2 | |
Merge topic 'cpack-doc-gen-names'
12deb051b3 Help: Use correct CPack generator names
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2563
Diffstat (limited to 'Help/release/3.6.rst')
| -rw-r--r-- | Help/release/3.6.rst | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Help/release/3.6.rst b/Help/release/3.6.rst index b2403cf..f0add07 100644 --- a/Help/release/3.6.rst +++ b/Help/release/3.6.rst @@ -165,24 +165,24 @@ CTest CPack ----- -* The :cpack_gen:`CPack Deb Generator` learned how to handle ``$ORIGIN`` +* The :cpack_gen:`CPack DEB Generator` learned how to handle ``$ORIGIN`` in ``CMAKE_INSTALL_RPATH`` when :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS` is used for dependency auto detection. -* The :cpack_gen:`CPack Deb Generator` learned how to generate +* The :cpack_gen:`CPack DEB Generator` learned how to generate ``DEBIAN/shlibs`` contorl file when package contains shared libraries. -* The :cpack_gen:`CPack Deb Generator` learned how to generate +* The :cpack_gen:`CPack DEB Generator` learned how to generate ``DEBIAN/postinst`` and ``DEBIAN/postrm`` files if the package installs libraries in ldconfig-controlled locations (e.g. ``/lib/``, ``/usr/lib/``). -* The :cpack_gen:`CPack Deb Generator` learned how to generate dependencies +* The :cpack_gen:`CPack DEB Generator` learned how to generate dependencies between Debian packages if multi-component setup is used and :variable:`CPACK_COMPONENT_<compName>_DEPENDS` variables are set. For backward compatibility this feature is disabled by default. See :variable:`CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS`. -* The :cpack_gen:`CPack Deb Generator` learned how to set custom package +* The :cpack_gen:`CPack DEB Generator` learned how to set custom package file names including how to generate properly-named Debian packages:: <PackageName>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb @@ -191,17 +191,17 @@ CPack :variable:`CPACK_DEBIAN_FILE_NAME` and :variable:`CPACK_DEBIAN_<COMPONENT>_FILE_NAME`. -* The :cpack_gen:`CPack Deb Generator` learned how to set the package +* The :cpack_gen:`CPack DEB Generator` learned how to set the package release number (``DebianRevisionNumber`` in package file name when used in combination with ``DEB-DEFAULT`` value set by :variable:`CPACK_DEBIAN_FILE_NAME`). See :variable:`CPACK_DEBIAN_PACKAGE_RELEASE`. -* The :cpack_gen:`CPack Deb Generator` learned how to set the package +* The :cpack_gen:`CPack DEB Generator` learned how to set the package architecture per-component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ARCHITECTURE`. -* The :cpack_gen:`CPack DMG Generator` learned a new option to skip the +* The :cpack_gen:`CPack DragNDrop Generator` learned a new option to skip the ``/Applications`` symlink. See the :variable:`CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK` variable. |