diff options
| author | Joshua Perrett <jperrett256@gmail.com> | 2023-01-18 17:58:09 +0000 |
|---|---|---|
| committer | Joshua Perrett <jperrett256@gmail.com> | 2023-01-18 21:43:49 +0000 |
| commit | 2e3fcf9399b3b4ab38039f90c826c46a3076044d (patch) | |
| tree | 99af4fd021103719e0d522364781dacb4f883320 /Help/guide | |
| parent | f04c548877d9844ee198022e3fce253b0916ca09 (diff) | |
| download | cmake-2e3fcf9399b3b4ab38039f90c826c46a3076044d.tar.gz | |
Tutorial: Fix typos in Step 11 exercise and solution
Diffstat (limited to 'Help/guide')
| -rw-r--r-- | Help/guide/tutorial/Adding Export Configuration.rst | 6 | ||||
| -rw-r--r-- | Help/guide/tutorial/Step12/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Help/guide/tutorial/Adding Export Configuration.rst b/Help/guide/tutorial/Adding Export Configuration.rst index eb14f42849..6c83276a4c 100644 --- a/Help/guide/tutorial/Adding Export Configuration.rst +++ b/Help/guide/tutorial/Adding Export Configuration.rst @@ -102,7 +102,7 @@ but prepended with a ``PACKAGE_`` prefix. :end-before: # generate the version file The :command:`write_basic_package_version_file` is next. This command writes -a file which is used by the "find_package" document the version and +a file which is used by :command:`find_package`, documenting the version and compatibility of the desired package. Here, we use the ``Tutorial_VERSION_*`` variables and say that it is compatible with ``AnyNewerVersion``, which denotes that this version or any higher one are compatible with the requested @@ -133,8 +133,8 @@ the following to the bottom of the top level ``CMakeLists.txt``: :caption: CMakeLists.txt :name: CMakeLists.txt-export :language: cmake - :start-after: # needs to be after the install(TARGETS ) command + :start-after: # needs to be after the install(TARGETS) command -With this export call we now generate a ``Targets.cmake``, allowing the +With this export call we now generate a ``MathFunctionsTargets.cmake``, allowing the configured ``MathFunctionsConfig.cmake`` in the build directory to be used by other projects, without needing it to be installed. diff --git a/Help/guide/tutorial/Step12/CMakeLists.txt b/Help/guide/tutorial/Step12/CMakeLists.txt index 220ed4b646..1d8b5a6e82 100644 --- a/Help/guide/tutorial/Step12/CMakeLists.txt +++ b/Help/guide/tutorial/Step12/CMakeLists.txt @@ -94,7 +94,7 @@ install(EXPORT MathFunctionsTargets ) include(CMakePackageConfigHelpers) -# generate the config file that is includes the exports +# 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" @@ -116,7 +116,7 @@ install(FILES ) # generate the export targets for the build tree -# needs to be after the install(TARGETS ) command +# needs to be after the install(TARGETS) command export(EXPORT MathFunctionsTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/MathFunctionsTargets.cmake" ) |