diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-08 14:43:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-08 14:43:29 (GMT) |
| commit | ddb608b1d95398774324761d68d71c8112882236 (patch) | |
| tree | 2a0ab14c45e88041400f068caf1319aa2c20177f /Help/guide | |
| parent | 827a98657e49e854cfd57eecf7878ff73e15794b (diff) | |
| parent | 6d48bd21acd9a061a8289e0b3f0a2b8a14e06205 (diff) | |
| download | CMake-ddb608b1d95398774324761d68d71c8112882236.zip CMake-ddb608b1d95398774324761d68d71c8112882236.tar.gz CMake-ddb608b1d95398774324761d68d71c8112882236.tar.bz2 | |
Merge topic 'fix-tutorial'
6d48bd21ac Tutorial: Clarify the expected change to target_include_directories
4d56db038d Tutorial: Make `INSTALL_DESTINATION` consistent with installed destination
da22b269b2 Tutorial: Add missing `$` in generator expression
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9120
Diffstat (limited to 'Help/guide')
| -rw-r--r-- | Help/guide/tutorial/Adding Generator Expressions.rst | 2 | ||||
| -rw-r--r-- | Help/guide/tutorial/Adding a Library.rst | 8 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step12/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Help/guide/tutorial/Adding Generator Expressions.rst b/Help/guide/tutorial/Adding Generator Expressions.rst index 910eacb..d2dddf7 100644 --- a/Help/guide/tutorial/Adding Generator Expressions.rst +++ b/Help/guide/tutorial/Adding Generator Expressions.rst @@ -24,7 +24,7 @@ Logical, Informational, and Output expressions. Logical expressions are used to create conditional output. The basic expressions are the ``0`` and ``1`` expressions. A ``$<0:...>`` results in the -empty string, and ``<1:...>`` results in the content of ``...``. They can also +empty string, and ``$<1:...>`` results in the content of ``...``. They can also be nested. Exercise 1 - Adding Compiler Warning Flags with Generator Expressions diff --git a/Help/guide/tutorial/Adding a Library.rst b/Help/guide/tutorial/Adding a Library.rst index 18ced97..cfcfc67 100644 --- a/Help/guide/tutorial/Adding a Library.rst +++ b/Help/guide/tutorial/Adding a Library.rst @@ -145,10 +145,10 @@ Next, the new library target is linked to the executable target using </details> -Finally we need to specify the library's header file location. Modify -:command:`target_include_directories` to add the ``MathFunctions`` subdirectory -as an include directory so that the ``MathFunctions.h`` header file can be -found. +Finally we need to specify the library's header file location. +Modify the existing :command:`target_include_directories` call +to add the ``MathFunctions`` subdirectory as an include directory +so that the ``MathFunctions.h`` header file can be found. .. raw:: html diff --git a/Help/guide/tutorial/Step12/CMakeLists.txt b/Help/guide/tutorial/Step12/CMakeLists.txt index 1d8b5a6..1ba4e31 100644 --- a/Help/guide/tutorial/Step12/CMakeLists.txt +++ b/Help/guide/tutorial/Step12/CMakeLists.txt @@ -97,7 +97,7 @@ include(CMakePackageConfigHelpers) # generate the config file that includes the exports configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/MathFunctionsConfig.cmake" - INSTALL_DESTINATION "lib/cmake/example" + INSTALL_DESTINATION "lib/cmake/MathFunctions" NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO ) |