diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-17 16:35:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-11-17 16:35:41 (GMT) |
| commit | cdd741ebf997ffdbf7408e6e8ec5701c2389ffda (patch) | |
| tree | a1b2e9697462965368777b1f433ba6a0f61b7458 /Modules/ExternalProject.cmake | |
| parent | 6f8532fbfac3912fcb0e8729d549f2bfb045c64e (diff) | |
| parent | 9283b206593197d56662b4696691fd274729a100 (diff) | |
| download | CMake-cdd741ebf997ffdbf7408e6e8ec5701c2389ffda.zip CMake-cdd741ebf997ffdbf7408e6e8ec5701c2389ffda.tar.gz CMake-cdd741ebf997ffdbf7408e6e8ec5701c2389ffda.tar.bz2 | |
Merge branch 'backport-ci-fedora-39' into ci-fedora-39
Diffstat (limited to 'Modules/ExternalProject.cmake')
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 801a8de..b2816a5 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -522,7 +522,7 @@ overridden if required. use the same generator as the main project, but the ``CMAKE_GENERATOR`` option can be given to override this. The project is responsible for adding any toolchain details, flags or other settings it wants to - re-use from the main project or otherwise specify (see ``CMAKE_ARGS``, + reuse from the main project or otherwise specify (see ``CMAKE_ARGS``, ``CMAKE_CACHE_ARGS`` and ``CMAKE_CACHE_DEFAULT_ARGS`` below). For non-CMake external projects, the ``CONFIGURE_COMMAND`` option must @@ -593,7 +593,7 @@ overridden if required. as initial defaults only and will not override any variables already set from a previous run. Use this option with care, as it can lead to different behavior depending on whether the build starts from a fresh - build directory or re-uses previous build contents. + build directory or reuses previous build contents. .. versionadded:: 3.15 If the CMake generator is the ``Green Hills MULTI`` and not overridden, |