summaryrefslogtreecommitdiffstats
path: root/Help/guide
diff options
context:
space:
mode:
authorBetsy McPhail <betsy.mcphail@kitware.com>2019-07-18 19:40:25 (GMT)
committerBrad King <brad.king@kitware.com>2019-08-19 15:49:05 (GMT)
commit61d4d990d620815fac62ccbb28cf522703dde923 (patch)
treee3272f847102a2806b360ae28020f768086a9791 /Help/guide
parenta36731c63460a41caae596b6dcbc75771a810549 (diff)
downloadCMake-61d4d990d620815fac62ccbb28cf522703dde923.zip
CMake-61d4d990d620815fac62ccbb28cf522703dde923.tar.gz
CMake-61d4d990d620815fac62ccbb28cf522703dde923.tar.bz2
Tutorial: Improve Step 7
* Update directions
Diffstat (limited to 'Help/guide')
-rw-r--r--Help/guide/tutorial/Step7/CMakeLists.txt2
-rw-r--r--Help/guide/tutorial/index.rst23
2 files changed, 17 insertions, 8 deletions
diff --git a/Help/guide/tutorial/Step7/CMakeLists.txt b/Help/guide/tutorial/Step7/CMakeLists.txt
index 78fee2f..c3b375a 100644
--- a/Help/guide/tutorial/Step7/CMakeLists.txt
+++ b/Help/guide/tutorial/Step7/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(Tutorial PUBLIC ${EXTRA_LIBS})
# so that we will find TutorialConfig.h
target_include_directories(Tutorial PUBLIC
"${PROJECT_BINARY_DIR}"
- )
+ )
# add the install targets
install(TARGETS Tutorial DESTINATION bin)
diff --git a/Help/guide/tutorial/index.rst b/Help/guide/tutorial/index.rst
index 6327c3d..22f3527 100644
--- a/Help/guide/tutorial/index.rst
+++ b/Help/guide/tutorial/index.rst
@@ -541,28 +541,37 @@ That is all there is to it. We start by including
``InstallRequiredSystemLibraries``. This module will include any runtime
libraries that are needed by the project for the current platform. Next we
set some CPack variables to where we have stored the license and version
-information for this project. The version information makes use of the
-variables we set earlier in this tutorial. Finally we include the CPack
-module which will use these variables and some other properties of the system
-you are on to setup an installer.
+information for this project. The version information was set earlier in this
+tutorial and the ``license.txt`` has been included in the top-level source
+directory for this step.
+
+Finally we include the CPack module which will use these variables and some
+other properties of the current system to setup an installer.
The next step is to build the project in the usual manner and then run
-CPack on it. To build a binary distribution you would run:
+CPack on it. To build a binary distribution, from the binary directory run:
.. code-block:: console
cpack
+To specify the generator, use the ``-G`` option. For multi-config builds, use
+``-C`` to specify the configuration. For example:
+
+.. code-block:: console
+
+ cpack -G ZIP -C Debug
+
To create a source distribution you would type:
.. code-block:: console
- cpack -C CPackSourceConfig.cmake
+ cpack --config CPackSourceConfig.cmake
Alternatively, run ``make package`` or right click the ``Package`` target and
``Build Project`` from an IDE.
-Run the installer executable found in the binary directory. Then run the
+Run the installer found in the binary directory. Then run the
installed executable and verify that it works.
Adding Support for a Dashboard (Step 8)