kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cpack-doc-typos' into release

This commit is contained in:
Brad King 2016-11-02 08:44:22 -04:00
parent 503766fa0e 4ab3b0c462
commit 2857ca89a2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CPackDeb.cmake
View File

@ -32,11 +32,11 @@
# - https://cmake.org/Wiki/CMake:CPackConfiguration # - https://cmake.org/Wiki/CMake:CPackConfiguration
# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 # - 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 # * Mandatory : NO
# * Default : OFF # * Default : OFF
@ -616,7 +616,7 @@ function(cpack_deb_prepare_package_vars)
find_program(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps) find_program(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps)
if(SHLIBDEPS_EXECUTABLE) 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 execute_process(COMMAND env LC_ALL=C ${SHLIBDEPS_EXECUTABLE} --version
OUTPUT_VARIABLE _TMP_VERSION OUTPUT_VARIABLE _TMP_VERSION
ERROR_QUIET ERROR_QUIET

6
Modules/CPackRPM.cmake
View File

@ -45,7 +45,7 @@
# #
# List of CPackRPM specific variables: # List of CPackRPM specific variables:
# #
# .. variable:: CPACK_RPM_PACKAGE_COMPONENT # .. variable:: CPACK_RPM_COMPONENT_INSTALL
# #
# Enable component packaging for CPackRPM # Enable component packaging for CPackRPM
# #
@ -461,7 +461,7 @@
# May be used to embed a pre (un)installation script in the spec file. # 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 # The referred script file (or both) will be read and directly
# put after the ``%pre`` or ``%preun`` section # 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 # script for each component can be overridden with
# ``CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE`` and # ``CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE`` and
# ``CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE``. # ``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. # 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 # The referred script file (or both) will be read and directly
# put after the ``%post`` or ``%postun`` section. # 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 # script for each component can be overridden with
# ``CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE`` and # ``CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE`` and
# ``CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE``. # ``CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE``.