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 | |
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')
28 files changed, 29 insertions, 29 deletions
diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index 12b0976..27b7ae8 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -22,7 +22,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ``<resultVar>``. Every subsequent CMake run will re-use this cached value +by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckCSourceCompiles.cmake b/Modules/CheckCSourceCompiles.cmake index ce4719a..79aca93 100644 --- a/Modules/CheckCSourceCompiles.cmake +++ b/Modules/CheckCSourceCompiles.cmake @@ -23,7 +23,7 @@ Check if given C source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake index d5a8fda..e06bcca 100644 --- a/Modules/CheckCSourceRuns.cmake +++ b/Modules/CheckCSourceRuns.cmake @@ -22,7 +22,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckCXXSourceCompiles.cmake b/Modules/CheckCXXSourceCompiles.cmake index 4b33aa8..7531236 100644 --- a/Modules/CheckCXXSourceCompiles.cmake +++ b/Modules/CheckCXXSourceCompiles.cmake @@ -23,7 +23,7 @@ Check if given C++ source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake index 3402715..eb643eb 100644 --- a/Modules/CheckCXXSourceRuns.cmake +++ b/Modules/CheckCXXSourceRuns.cmake @@ -22,7 +22,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckCompilerFlag.cmake b/Modules/CheckCompilerFlag.cmake index a18435b..0f2ec4c 100644 --- a/Modules/CheckCompilerFlag.cmake +++ b/Modules/CheckCompilerFlag.cmake @@ -23,7 +23,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ``<resultVar>``. Every subsequent CMake run will re-use this cached value +by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckFortranCompilerFlag.cmake b/Modules/CheckFortranCompilerFlag.cmake index 9164565..81a2345 100644 --- a/Modules/CheckFortranCompilerFlag.cmake +++ b/Modules/CheckFortranCompilerFlag.cmake @@ -24,7 +24,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ``<resultVar>``. Every subsequent CMake run will re-use this cached value +by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckFortranSourceCompiles.cmake b/Modules/CheckFortranSourceCompiles.cmake index 5158b7e..ed374ef 100644 --- a/Modules/CheckFortranSourceCompiles.cmake +++ b/Modules/CheckFortranSourceCompiles.cmake @@ -48,7 +48,7 @@ Check if given Fortran source compiles and links into an executable. ``.F90`` is a typical choice. The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckFortranSourceRuns.cmake b/Modules/CheckFortranSourceRuns.cmake index f996749..9bf9fb2 100644 --- a/Modules/CheckFortranSourceRuns.cmake +++ b/Modules/CheckFortranSourceRuns.cmake @@ -44,7 +44,7 @@ subsequently be run. ``SRC_EXT`` option can be used to override this with ``.<extension>`` instead. The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckOBJCCompilerFlag.cmake b/Modules/CheckOBJCCompilerFlag.cmake index 24bf0db..f6d259e 100644 --- a/Modules/CheckOBJCCompilerFlag.cmake +++ b/Modules/CheckOBJCCompilerFlag.cmake @@ -24,7 +24,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ``<resultVar>``. Every subsequent CMake run will re-use this cached value +by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckOBJCSourceCompiles.cmake b/Modules/CheckOBJCSourceCompiles.cmake index 7663054..bc0cac1 100644 --- a/Modules/CheckOBJCSourceCompiles.cmake +++ b/Modules/CheckOBJCSourceCompiles.cmake @@ -25,7 +25,7 @@ Check if given Objective-C source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckOBJCSourceRuns.cmake b/Modules/CheckOBJCSourceRuns.cmake index a23a0c7..511cac6 100644 --- a/Modules/CheckOBJCSourceRuns.cmake +++ b/Modules/CheckOBJCSourceRuns.cmake @@ -24,7 +24,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckOBJCXXCompilerFlag.cmake b/Modules/CheckOBJCXXCompilerFlag.cmake index ae2d907..32d50c9 100644 --- a/Modules/CheckOBJCXXCompilerFlag.cmake +++ b/Modules/CheckOBJCXXCompilerFlag.cmake @@ -24,7 +24,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ``<resultVar>``. Every subsequent CMake run will re-use this cached value +by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckOBJCXXSourceCompiles.cmake b/Modules/CheckOBJCXXSourceCompiles.cmake index cfbda3a..366d7d5 100644 --- a/Modules/CheckOBJCXXSourceCompiles.cmake +++ b/Modules/CheckOBJCXXSourceCompiles.cmake @@ -25,7 +25,7 @@ Check if given Objective-C++ source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckOBJCXXSourceRuns.cmake b/Modules/CheckOBJCXXSourceRuns.cmake index b2831b6..49db3cb 100644 --- a/Modules/CheckOBJCXXSourceRuns.cmake +++ b/Modules/CheckOBJCXXSourceRuns.cmake @@ -24,7 +24,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckSourceCompiles.cmake b/Modules/CheckSourceCompiles.cmake index 041b59c..af905a4 100644 --- a/Modules/CheckSourceCompiles.cmake +++ b/Modules/CheckSourceCompiles.cmake @@ -48,7 +48,7 @@ Check if given source compiles and links into an executable. HAVE_ERROR_STOP) The check is only performed once, with the result cached in the variable - named by ``<resultVar>``. Every subsequent CMake run will re-use this cached + named by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/CheckSourceRuns.cmake b/Modules/CheckSourceRuns.cmake index 822ee07..75636f4 100644 --- a/Modules/CheckSourceRuns.cmake +++ b/Modules/CheckSourceRuns.cmake @@ -48,7 +48,7 @@ subsequently be run. HAVE_COARRAY) The check is only performed once, with the result cached in the variable named - by ``<resultVar>``. Every subsequent CMake run will re-use this cached value + by ``<resultVar>``. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ``<code>`` changes. In order to force the check to be re-evaluated, the variable named by ``<resultVar>`` must be manually removed from the cache. diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 45c5470..a9663d6 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -54,7 +54,7 @@ set(_cmake_feature_test_cxx_user_literals "${GNU47_CXX11}") # NOTE: C++11 was ratified in September 2011. GNU 4.7 is the first minor # release following that (March 2012), and the first minor release to # support -std=c++11. Prior to that, support for C++11 features is technically -# experiemental and possibly incomplete (see for example the note below about +# experimental and possibly incomplete (see for example the note below about # cxx_variadic_template_template_parameters) # GNU does not define __cplusplus correctly before version 4.7. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=1773 diff --git a/Modules/Compiler/LCC-CXX-FeatureTests.cmake b/Modules/Compiler/LCC-CXX-FeatureTests.cmake index 45c5470..a9663d6 100644 --- a/Modules/Compiler/LCC-CXX-FeatureTests.cmake +++ b/Modules/Compiler/LCC-CXX-FeatureTests.cmake @@ -54,7 +54,7 @@ set(_cmake_feature_test_cxx_user_literals "${GNU47_CXX11}") # NOTE: C++11 was ratified in September 2011. GNU 4.7 is the first minor # release following that (March 2012), and the first minor release to # support -std=c++11. Prior to that, support for C++11 features is technically -# experiemental and possibly incomplete (see for example the note below about +# experimental and possibly incomplete (see for example the note below about # cxx_variadic_template_template_parameters) # GNU does not define __cplusplus correctly before version 4.7. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=1773 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, diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 0d7f1a4..203a473 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1423,7 +1423,7 @@ function(CUDA_COMPUTE_BUILD_PATH path build_path) # Only deal with CMake style paths from here on out file(TO_CMAKE_PATH "${path}" bpath) if (IS_ABSOLUTE "${bpath}") - # Absolute paths are generally unnessary, especially if something like + # Absolute paths are generally unnecessary, especially if something like # file(GLOB_RECURSE) is used to pick up the files. string(FIND "${bpath}" "${CMAKE_CURRENT_BINARY_DIR}" _binary_dir_pos) diff --git a/Modules/FindEnvModules.cmake b/Modules/FindEnvModules.cmake index dab97ac..5337e4f 100644 --- a/Modules/FindEnvModules.cmake +++ b/Modules/FindEnvModules.cmake @@ -81,7 +81,7 @@ modules: .. command:: env_module - Execute an aribitrary module command: + Execute an arbitrary module command: .. code-block:: cmake diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index e3246c6..a25f113 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -436,7 +436,7 @@ function (_MPI_interrogate_compiler LANG) # a particular MPICH derivate might check compiler interoperability. # Intel MPI in particular does this with I_MPI_CHECK_COMPILER. file(TO_NATIVE_PATH "${CMAKE_${LANG}_COMPILER}" _MPI_UNDERLAYING_COMPILER) - # On Windows, the Intel MPI batch scripts can only work with filnames - Full paths will break them. + # On Windows, the Intel MPI batch scripts can only work with filenames - Full paths will break them. # Due to the lack of other MPICH-based wrappers for Visual C++, we may treat this as default. if(MSVC) get_filename_component(_MPI_UNDERLAYING_COMPILER "${_MPI_UNDERLAYING_COMPILER}" NAME) diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index c68e18d..7691eb7 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -181,7 +181,7 @@ if(SDL_LIBRARY_TEMP) # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa. # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. + # though it actually is there if I modify a preused variable. # I think it has something to do with the CACHE STRING. # So I use a temporary variable until the end so I can set the # "real" variable in one-shot. diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index d863e3c..3443959 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -196,7 +196,7 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) # I expect that MPGLIB, VOC, WAV, AIFF, and SHN are compiled in statically. # I think Timidity is also compiled in statically. - # I've never had to explcitly link against Quicktime, so I'll skip that for now. + # I've never had to explicitly link against Quicktime, so I'll skip that for now. set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARY}) diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake index 40e767b..a01c010 100644 --- a/Modules/FindXCTest.cmake +++ b/Modules/FindXCTest.cmake @@ -74,7 +74,7 @@ if(CMAKE_EFFECTIVE_SYSTEM_NAME STREQUAL "Apple" # platform directory which is not added to the CMAKE_FIND_ROOT_PATH # (only to CMAKE_SYSTEM_FRAMEWORK_PATH) and therefore not searched. # - # Until this is properly addressed, temporaily add the platform + # Until this is properly addressed, temporarily add the platform # directory to CMAKE_FIND_ROOT_PATH. list(APPEND CMAKE_FIND_ROOT_PATH "${_CMAKE_OSX_SYSROOT_PATH}/../..") endif() diff --git a/Modules/Internal/CPack/CPackFreeBSD.cmake b/Modules/Internal/CPack/CPackFreeBSD.cmake index c35089c..46a7bf7 100644 --- a/Modules/Internal/CPack/CPackFreeBSD.cmake +++ b/Modules/Internal/CPack/CPackFreeBSD.cmake @@ -66,7 +66,7 @@ _cpack_freebsd_fallback_var("CPACK_FREEBSD_PACKAGE_DESCRIPTION" ) # There's really only one homepage for a project, so -# re-use the Debian setting if it's there. +# reuse the Debian setting if it's there. _cpack_freebsd_fallback_var("CPACK_FREEBSD_PACKAGE_WWW" "CPACK_PACKAGE_HOMEPAGE_URL" "CPACK_DEBIAN_PACKAGE_HOMEPAGE" diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 99fd617..1724c3a 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -1521,7 +1521,7 @@ function (create_javah) "CLASSES;CLASSPATH;DEPENDS" ${ARGN}) - # ckeck parameters + # check parameters if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES) message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.") endif() |