summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-07 14:31:52 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-10-07 14:32:03 (GMT)
commit27928290acc81971fbaf5cac04f9667ba39d72d8 (patch)
treef9e7630c179cbcb535c924e82228545fce2608fd
parent52891c816d167a417961f5a7dbb1c2f0636969ab (diff)
parent12368e6d15c4fd7a682aad8127fb4168971d0013 (diff)
downloadCMake-27928290acc81971fbaf5cac04f9667ba39d72d8.zip
CMake-27928290acc81971fbaf5cac04f9667ba39d72d8.tar.gz
CMake-27928290acc81971fbaf5cac04f9667ba39d72d8.tar.bz2
Merge topic 'doc-install-strip'
12368e6d15 Help: Document install/strip targets for Ninja/UNIX Makefiles generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3887
-rw-r--r--Help/generator/Ninja.rst13
-rw-r--r--Help/generator/Unix Makefiles.rst29
2 files changed, 36 insertions, 6 deletions
diff --git a/Help/generator/Ninja.rst b/Help/generator/Ninja.rst
index 51ef49b..c75d2c4 100644
--- a/Help/generator/Ninja.rst
+++ b/Help/generator/Ninja.rst
@@ -3,9 +3,9 @@ Ninja
Generates build.ninja files.
-A build.ninja file is generated into the build tree. Recent versions
-of the ninja program can build the project through the ``all`` target.
-An ``install`` target is also provided.
+A ``build.ninja`` file is generated into the build tree. Use the ninja
+program to build the project through the ``all`` target and install the
+project through the ``install`` (or ``install/strip``) target.
For each subdirectory ``sub/dir`` of the project, additional targets
are generated:
@@ -16,6 +16,13 @@ are generated:
``sub/dir/install``
Runs the install step in the subdirectory, if any.
+``sub/dir/install/strip``
+ Runs the install step in the subdirectory followed by a ``CMAKE_STRIP`` command,
+ if any.
+
+ The ``CMAKE_STRIP`` variable will contain the platform's ``strip`` utility, which
+ removes symbols information from generated binaries.
+
``sub/dir/test``
Runs the test step in the subdirectory, if any.
diff --git a/Help/generator/Unix Makefiles.rst b/Help/generator/Unix Makefiles.rst
index 1e65ee1..dfe4ecb 100644
--- a/Help/generator/Unix Makefiles.rst
+++ b/Help/generator/Unix Makefiles.rst
@@ -3,6 +3,29 @@ Unix Makefiles
Generates standard UNIX makefiles.
-A hierarchy of UNIX makefiles is generated into the build tree. Any
-standard UNIX-style make program can build the project through the
-default ``all`` target. An ``install`` target is also provided.
+A hierarchy of UNIX makefiles is generated into the build tree. Use
+any standard UNIX-style make program to build the project through
+the ``all`` target and install the project through the ``install``
+(or ``install/strip``) target.
+
+For each subdirectory ``sub/dir`` of the project a UNIX makefile will
+be created, containing the following targets:
+
+``all``
+ Depends on all targets required by the subdirectory.
+
+``install``
+ Runs the install step in the subdirectory, if any.
+
+``install/strip``
+ Runs the install step in the subdirectory followed by a ``CMAKE_STRIP`` command,
+ if any.
+
+ The ``CMAKE_STRIP`` variable will contain the platform's ``strip`` utility, which
+ removes symbols information from generated binaries.
+
+``test``
+ Runs the test step in the subdirectory, if any.
+
+``package``
+ Runs the package step in the subdirectory, if any.