diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-02 12:44:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-02 12:44:22 (GMT) |
| commit | 2857ca89a2aa0561f814ae925c0bd96262fd4509 (patch) | |
| tree | b8229475ee6f02bbecee121689c1d50eae13dbdc | |
| parent | 503766fa0e3ce87b60d4b55ff044c58242816873 (diff) | |
| parent | 4ab3b0c462d45080ec31e5e1e7dbfa1c0ab886bf (diff) | |
| download | CMake-2857ca89a2aa0561f814ae925c0bd96262fd4509.zip CMake-2857ca89a2aa0561f814ae925c0bd96262fd4509.tar.gz CMake-2857ca89a2aa0561f814ae925c0bd96262fd4509.tar.bz2 | |
Merge branch 'cpack-doc-typos' into release
| -rw-r--r-- | Modules/CPackDeb.cmake | 8 | ||||
| -rw-r--r-- | Modules/CPackRPM.cmake | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 653283c..909a12b 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -32,11 +32,11 @@ # - https://cmake.org/Wiki/CMake:CPackConfiguration # - https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 # -# List of CPackRPM specific variables: +# List of CPackDEB specific variables: # -# .. variable:: CPACK_DEB_PACKAGE_COMPONENT +# .. variable:: CPACK_DEB_COMPONENT_INSTALL # -# Enable component packaging for CPackRPM +# Enable component packaging for CPackDEB # # * Mandatory : NO # * Default : OFF @@ -616,7 +616,7 @@ function(cpack_deb_prepare_package_vars) find_program(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps) if(SHLIBDEPS_EXECUTABLE) - # Check version of the dpkg-shlibdeps tool using CPackRPM method + # Check version of the dpkg-shlibdeps tool using CPackDEB method execute_process(COMMAND env LC_ALL=C ${SHLIBDEPS_EXECUTABLE} --version OUTPUT_VARIABLE _TMP_VERSION ERROR_QUIET diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 15b62c7..0640630 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -45,7 +45,7 @@ # # List of CPackRPM specific variables: # -# .. variable:: CPACK_RPM_PACKAGE_COMPONENT +# .. variable:: CPACK_RPM_COMPONENT_INSTALL # # Enable component packaging for CPackRPM # @@ -461,7 +461,7 @@ # May be used to embed a pre (un)installation script in the spec file. # The referred script file (or both) will be read and directly # put after the ``%pre`` or ``%preun`` section -# If :variable:`CPACK_RPM_PACKAGE_COMPONENT` is set to ON the (un)install +# If :variable:`CPACK_RPM_COMPONENT_INSTALL` is set to ON the (un)install # script for each component can be overridden with # ``CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE`` and # ``CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE``. @@ -480,7 +480,7 @@ # May be used to embed a post (un)installation script in the spec file. # The referred script file (or both) will be read and directly # put after the ``%post`` or ``%postun`` section. -# If :variable:`CPACK_RPM_PACKAGE_COMPONENT` is set to ON the (un)install +# If :variable:`CPACK_RPM_COMPONENT_INSTALL` is set to ON the (un)install # script for each component can be overridden with # ``CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE`` and # ``CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE``. |