Merge branch 'backport-ci-fedora-39' into ci-fedora-39

This commit is contained in:
Brad King
2023-11-17 11:35:41 -05:00
122 changed files with 484 additions and 437 deletions

View File

@@ -3,15 +3,18 @@ Checks: "-*,\
bugprone-*,\
-bugprone-assignment-in-if-condition,\
-bugprone-easily-swappable-parameters,\
-bugprone-empty-catch,\
-bugprone-implicit-widening-of-multiplication-result,\
-bugprone-macro-parentheses,\
-bugprone-misplaced-widening-cast,\
-bugprone-narrowing-conversions,\
-bugprone-switch-missing-default-case,\
-bugprone-too-small-loop-variable,\
-bugprone-unchecked-optional-access,\
misc-*,\
-misc-confusable-identifiers,\
-misc-const-correctness,\
-misc-include-cleaner,\
-misc-no-recursion,\
-misc-non-private-member-variables-in-classes,\
-misc-static-assert,\
@@ -20,14 +23,18 @@ modernize-*,\
-modernize-avoid-c-arrays,\
-modernize-macro-to-enum,\
-modernize-return-braced-init-list,\
-modernize-type-traits,\
-modernize-use-emplace,\
-modernize-use-nodiscard,\
-modernize-use-noexcept,\
-modernize-use-trailing-return-type,\
-modernize-use-transparent-functors,\
performance-*,\
-performance-avoid-endl,\
-performance-inefficient-vector-operation,\
-performance-noexcept-swap,\
readability-*,\
-readability-avoid-unconditional-preprocessor-if,\
-readability-convert-member-functions-to-static,\
-readability-function-cognitive-complexity,\
-readability-function-size,\
@@ -41,6 +48,7 @@ readability-*,\
-readability-redundant-declaration,\
-readability-redundant-member-init,\
-readability-simplify-boolean-expr,\
-readability-static-accessed-through-instance,\
-readability-suspicious-call-argument,\
-readability-uppercase-literal-suffix,\
cmake-*,\

View File

@@ -59,7 +59,7 @@ p:source-package:
p:doc-package:
extends:
- .fedora38_sphinx_package
- .fedora39_sphinx_package
- .cmake_prep_doc_linux
- .linux_x86_64_tags
- .cmake_doc_artifacts
@@ -108,17 +108,17 @@ l:iwyu-debian12:
- .cmake_cdash_artifacts
- .run_automatically
l:tidy-fedora38:
l:tidy-fedora39:
extends:
- .fedora38_tidy
- .fedora39_tidy
- .cmake_build_linux
- .linux_x86_64_tags
- .cmake_cdash_artifacts
- .run_automatically
l:sphinx-fedora38:
l:sphinx-fedora39:
extends:
- .fedora38_sphinx
- .fedora39_sphinx
- .cmake_build_linux
- .cmake_sphinx_artifacts
- .linux_x86_64_tags
@@ -127,9 +127,9 @@ l:sphinx-fedora38:
CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_HELP: "true"
l:clang-analyzer-fedora38:
l:clang-analyzer-fedora39:
extends:
- .fedora38_clang_analyzer
- .fedora39_clang_analyzer
- .cmake_build_linux
- .linux_x86_64_tags
- .run_automatically
@@ -223,9 +223,9 @@ t:debian12-hip-radeon:
variables:
CMAKE_CI_NO_MR: "true"
t:fedora38-hip-radeon:
t:fedora39-hip-radeon:
extends:
- .fedora38_hip_radeon
- .fedora39_hip_radeon
- .cmake_test_linux_release
- .linux_x86_64_tags_radeon
- .run_dependent
@@ -233,9 +233,9 @@ t:fedora38-hip-radeon:
variables:
CMAKE_CI_NO_MR: "true"
t:fedora38-ninja-clang:
t:fedora39-ninja-clang:
extends:
- .fedora38_ninja_clang
- .fedora39_ninja_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -243,9 +243,9 @@ t:fedora38-ninja-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora38-ninja-multi-clang:
t:fedora39-ninja-multi-clang:
extends:
- .fedora38_ninja_multi_clang
- .fedora39_ninja_multi_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -253,9 +253,9 @@ t:fedora38-ninja-multi-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora38-makefiles-clang:
t:fedora39-makefiles-clang:
extends:
- .fedora38_makefiles_clang
- .fedora39_makefiles_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -263,17 +263,17 @@ t:fedora38-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora38-makefiles:
t:fedora39-makefiles:
extends:
- .fedora38_makefiles
- .fedora39_makefiles
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
- .needs_centos7_x86_64
t:fedora38-makefiles-nospace:
t:fedora39-makefiles-nospace:
extends:
- .fedora38_makefiles
- .fedora39_makefiles
- .cmake_test_linux_release
- .linux_x86_64_tags
- .cmake_junit_artifacts
@@ -281,7 +281,7 @@ t:fedora38-makefiles-nospace:
- .needs_centos7_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CI_BUILD_NAME: fedora38_makefiles_nospace
CMAKE_CI_BUILD_NAME: fedora39_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
t:nvhpc22.11-ninja:
@@ -413,9 +413,9 @@ t:debian10-legacy:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora38-ninja:
b:fedora39-ninja:
extends:
- .fedora38_ninja
- .fedora39_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -423,9 +423,9 @@ b:fedora38-ninja:
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
b:fedora38-makefiles-symlinked:
b:fedora39-makefiles-symlinked:
extends:
- .fedora38_makefiles_symlinked
- .fedora39_makefiles_symlinked
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -460,54 +460,54 @@ b:debian12-aarch64-extdeps:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora38-extdeps:
b:fedora39-extdeps:
extends:
- .fedora38_extdeps
- .fedora39_extdeps
- .cmake_build_linux_standalone
- .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora38-ninja:
t:fedora39-ninja:
extends:
- .fedora38_ninja
- .fedora39_ninja
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
- b:fedora38-ninja
- b:fedora39-ninja
needs:
- b:fedora38-ninja
- b:fedora39-ninja
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
t:fedora38-makefiles-symlinked:
t:fedora39-makefiles-symlinked:
extends:
- .fedora38_makefiles_symlinked
- .fedora39_makefiles_symlinked
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
- b:fedora38-makefiles-symlinked
- b:fedora39-makefiles-symlinked
needs:
- b:fedora38-makefiles-symlinked
- b:fedora39-makefiles-symlinked
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora38-ninja-multi:
t:fedora39-ninja-multi:
extends:
- .fedora38_ninja_multi
- .fedora39_ninja_multi
- .cmake_test_linux_external
- .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
dependencies:
- t:fedora38-ninja
- t:fedora39-ninja
needs:
- t:fedora38-ninja
- t:fedora39-ninja
t:intel2016-makefiles:
extends:
@@ -874,9 +874,9 @@ u:linux-aarch64-package:
## Sanitizer builds
b:fedora38-asan:
b:fedora39-asan:
extends:
- .fedora38_asan
- .fedora39_asan
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -884,16 +884,16 @@ b:fedora38-asan:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora38-asan:
t:fedora39-asan:
extends:
- .fedora38_asan
- .fedora39_asan
- .cmake_memcheck_linux
- .linux_x86_64_tags
- .run_dependent
dependencies:
- b:fedora38-asan
- b:fedora39-asan
needs:
- b:fedora38-asan
- b:fedora39-asan
variables:
CMAKE_CI_JOB_NIGHTLY: "true"

View File

@@ -1,3 +0,0 @@
set(configure_no_sccache 1)
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")

View File

@@ -1,4 +0,0 @@
set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")

View File

@@ -1,4 +0,0 @@
set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")

View File

@@ -1,4 +1,4 @@
set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

View File

@@ -0,0 +1,3 @@
set(configure_no_sccache 1)
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

View File

@@ -1,6 +1,5 @@
set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "")
set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "")
set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "")
set(CMAKE_Fortran_FLAGS "-flang-experimental-exec" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

View File

@@ -57,7 +57,7 @@ set(CMake_TEST_FindLibXslt "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_C "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_CXX "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "")
set(CMake_TEST_FindMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib;FI_PROVIDER=set:tcp" CACHE STRING "")
set(CMake_TEST_FindMPI "ON" CACHE BOOL "")
set(CMake_TEST_FindODBC "ON" CACHE BOOL "")
set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "")

View File

@@ -2,4 +2,4 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")

View File

@@ -1,2 +1,2 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

View File

@@ -11,4 +11,4 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE STRING "")
# Cover compilation with C++11 only and not higher standards.
set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

View File

@@ -0,0 +1,3 @@
set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")

View File

@@ -0,0 +1,3 @@
set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")

View File

@@ -2,4 +2,4 @@ set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "")
set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

View File

@@ -1,5 +1,4 @@
if("$ENV{CMAKE_CI_BUILD_NAME}" MATCHES "(^|_)gnu(_|$)")
set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake")

View File

@@ -34,6 +34,15 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "nvhpc_")
)
endif()
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "fedora39_makefiles")
list(APPEND test_exclusions
# FIXME(#25421): CPack/RPM needs an update for Fedora 39.
"^CPackComponentsForAll-RPM-default$"
"^CPackComponentsForAll-RPM-AllInOne$"
"^CPackComponentsForAll-RPM-OnePackPerGroup$"
)
endif()
string(REPLACE ";" "|" test_exclusions "${test_exclusions}")
if (test_exclusions)
set(test_exclusions "(${test_exclusions})")

View File

@@ -1,3 +0,0 @@
# Default to C++ extensions being off. Clang's modules support have trouble
# with extensions right now.
set(CMAKE_CXX_EXTENSIONS OFF)

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE=fedora:38
ARG BASE_IMAGE=fedora:39
FROM ${BASE_IMAGE} AS dnf-cache
# Populate DNF cache w/ the fresh metadata and prefetch packages.

View File

@@ -6,6 +6,7 @@ qt6-qtbase-devel
# Install development tools.
clang
clang-devel
clang-tools-extra
clang-tools-extra-devel
compiler-rt
@@ -13,6 +14,7 @@ flang
flang-devel
gcc-c++
git-core
llvm-devel
make
# Install optional external build dependencies.

View File

@@ -19,12 +19,12 @@ for p in Demo test; do
done
# Remove tests for numpy
for v in 2.7 3.11; do
for v in 2.7 3.12; do
find /usr/lib64/python${v}/site-packages/numpy -type d -a -name tests -exec rm -rf {} +
done
# Remove some other packages tests
find /usr/lib64/python3.11/site-packages/breezy -type d -a -name tests -exec rm -rf {} +
find /usr/lib64/python3.12/site-packages/breezy -type d -a -name tests -exec rm -rf {} +
# Perforce
curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \

View File

@@ -1,4 +0,0 @@
export CC=/usr/bin/clang-16
export CXX=/usr/bin/clang++-16
export FC=/usr/bin/flang-new
export FFLAGS=-flang-experimental-exec

View File

@@ -1 +0,0 @@
export HIPCXX=/usr/bin/clang++-16

View File

@@ -1 +0,0 @@
. .gitlab/ci/env_fedora38_common_clang.sh

View File

@@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/env_fedora38_makefiles.cmake")

View File

@@ -1 +0,0 @@
. .gitlab/ci/env_fedora38_makefiles.sh

View File

@@ -1 +0,0 @@
. .gitlab/ci/env_fedora38_common_clang.sh

View File

@@ -1 +0,0 @@
. .gitlab/ci/env_fedora38_common_clang.sh

View File

@@ -0,0 +1,3 @@
export CC=/usr/bin/clang-17
export CXX=/usr/bin/clang++-17
export FC=/usr/bin/flang-new

View File

@@ -0,0 +1 @@
export HIPCXX=/usr/bin/clang++-17

View File

@@ -0,0 +1 @@
. .gitlab/ci/env_fedora39_common_clang.sh

View File

@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/env_fedora39_makefiles.cmake")

View File

@@ -0,0 +1 @@
. .gitlab/ci/env_fedora39_makefiles.sh

View File

@@ -0,0 +1 @@
. .gitlab/ci/env_fedora39_common_clang.sh

View File

@@ -0,0 +1 @@
. .gitlab/ci/env_fedora39_common_clang.sh

View File

@@ -5,7 +5,7 @@
### Release
.linux_prep_source:
image: "fedora:38"
image: "fedora:39"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
### Fedora
.fedora38:
image: "kitware/cmake:ci-fedora38-x86_64-2023-08-07"
.fedora39:
image: "kitware/cmake:ci-fedora39-x86_64-2023-11-16"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
#### Lint builds
.fedora38_tidy:
extends: .fedora38
.fedora39_tidy:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_tidy
CMAKE_CONFIGURATION: fedora39_tidy
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
.fedora38_clang_analyzer:
extends: .fedora38
.fedora39_clang_analyzer:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_clang_analyzer
CMAKE_CONFIGURATION: fedora39_clang_analyzer
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
.fedora38_sphinx:
extends: .fedora38
.fedora39_sphinx:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_sphinx
CMAKE_CONFIGURATION: fedora39_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMAKE_CI_NO_INSTALL: 1
.fedora38_sphinx_package:
extends: .fedora38
.fedora39_sphinx_package:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_sphinx_package
CMAKE_CONFIGURATION: fedora39_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@@ -163,43 +163,43 @@
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora38_extdeps:
extends: .fedora38
.fedora39_extdeps:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_extdeps
CMAKE_CONFIGURATION: fedora39_extdeps
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora38_ninja:
extends: .fedora38
.fedora39_ninja:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_ninja
CMAKE_CONFIGURATION: fedora39_ninja
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora38_ninja_multi:
extends: .fedora38
.fedora39_ninja_multi:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_ninja_multi
CMAKE_CONFIGURATION: fedora39_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
.fedora38_makefiles:
extends: .fedora38
.fedora39_makefiles:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_makefiles
CMAKE_CONFIGURATION: fedora39_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
.fedora38_makefiles_symlinked:
extends: .fedora38
.fedora39_makefiles_symlinked:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_makefiles_symlinked
CMAKE_CONFIGURATION: fedora39_makefiles_symlinked
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
CMAKE_CI_IN_SYMLINK_TREE: 1
@@ -220,24 +220,24 @@
variables:
CMAKE_CONFIGURATION: debian12_ninja_clang
.fedora38_makefiles_clang:
extends: .fedora38
.fedora39_makefiles_clang:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_makefiles_clang
CMAKE_CONFIGURATION: fedora39_makefiles_clang
CMAKE_GENERATOR: "Unix Makefiles"
.fedora38_ninja_clang:
extends: .fedora38
.fedora39_ninja_clang:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_ninja_clang
CMAKE_CONFIGURATION: fedora39_ninja_clang
.fedora38_ninja_multi_clang:
extends: .fedora38
.fedora39_ninja_multi_clang:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_ninja_multi_clang
CMAKE_CONFIGURATION: fedora39_ninja_multi_clang
CMAKE_GENERATOR: "Ninja Multi-Config"
### Sanitizers
@@ -253,13 +253,13 @@
CTEST_MEMORYCHECK_TYPE: AddressSanitizer
CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
.fedora38_asan:
.fedora39_asan:
extends:
- .fedora38
- .fedora39
- .fedora_asan_addon
variables:
CMAKE_CONFIGURATION: fedora38_asan
CMAKE_CONFIGURATION: fedora39_asan
### Intel Compiler
@@ -392,11 +392,11 @@
CMAKE_CONFIGURATION: debian12_hip_radeon
CTEST_LABELS: "HIP"
.fedora38_hip_radeon:
extends: .fedora38
.fedora39_hip_radeon:
extends: .fedora39
variables:
CMAKE_CONFIGURATION: fedora38_hip_radeon
CMAKE_CONFIGURATION: fedora39_hip_radeon
CTEST_LABELS: "HIP"
.hip5.5_nvidia:
@@ -526,7 +526,7 @@
.cmake_codespell_linux:
stage: build
extends: .fedora38
extends: .fedora39
script:
- .gitlab/ci/codespell.sh
interruptible: true
@@ -670,7 +670,7 @@
.cmake_org_help:
stage: build
extends:
- .fedora38
- .fedora39
- .linux_x86_64_tags
- .cmake_org_help_artifacts
script:

View File

@@ -1,7 +1,7 @@
# Steps for uploading artifacts
.rsync_upload_package:
image: "fedora:38"
image: "fedora:39"
stage: upload
tags:
- cmake
@@ -21,7 +21,7 @@
.rsync_upload_help:
stage: upload
image: "fedora:38"
image: "fedora:39"
tags:
- cmake
- docker

View File

@@ -5,7 +5,7 @@
if(CPACK_GENERATOR MATCHES "NSIS")
set(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
# set the install/unistall icon used for the installer itself
# set the install/uninstall icon used for the installer itself
# There is a bug in NSI that does not handle full unix paths properly.
set(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
set(CPACK_NSIS_MUI_UNIICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")

View File

@@ -195,7 +195,7 @@ prints::
Immediate Message
Deferred Message
The ``Cancelled Message`` is never printed because its command is
The ``Canceled Message`` is never printed because its command is
canceled. The ``deferred_message`` variable reference is not evaluated
until the call site, so it can be set after the deferred call is scheduled.

View File

@@ -94,7 +94,7 @@ Reusing Precompile Headers
^^^^^^^^^^^^^^^^^^^^^^^^^^
The command also supports a second signature which can be used to specify that
one target re-uses a precompiled header file artifact from another target
one target reuses a precompiled header file artifact from another target
instead of generating its own:
.. code-block:: cmake

View File

@@ -19,9 +19,9 @@ be used on FreeBSD, DragonflyBSD, NetBSD, OpenBSD, but also on Linux or OSX,
depending on the installed package-management tools -- using :module:`CPack`.
The CPack FreeBSD generator is a :module:`CPack` generator and uses the
:variable:`!CPACK_XXX` variables used by :module:`CPack`. It tries to re-use packaging
:variable:`!CPACK_XXX` variables used by :module:`CPack`. It tries to reuse packaging
information that may already be specified for Debian packages for the
:cpack_gen:`CPack DEB Generator`. It also tries to re-use RPM packaging
:cpack_gen:`CPack DEB Generator`. It also tries to reuse RPM packaging
information when Debian does not specify.
The CPack FreeBSD generator should work on any host with libpkg installed. The

View File

@@ -338,7 +338,7 @@ policies added for that version. Commit with a message such as::
export: Increase maximum policy version in exported files to $prev
The files generatd by `install(EXPORT)` and `export()` commands
The files generated by `install(EXPORT)` and `export()` commands
are known to work with policies as of CMake $prev, so enable them
in sufficiently new CMake versions.

View File

@@ -263,7 +263,7 @@ Changes made since CMake 3.10.0 include the following.
3.10.1
------
* The :manual:`cmake-server(7)` ``codemodel`` response ``crossReferences``
* The :manual:`cmake-server(7)` ``codemodel`` response cross-references
field added by 3.10.0 has been dropped due to excessive memory usage.
Another approach will be needed to provide backtrace information.

View File

@@ -318,7 +318,7 @@ Changes made since CMake 3.21.0 include the following.
* The :generator:`Visual Studio 17 2022` generator is now based on
"Visual Studio 2022 Preview 4". Previously it was based on "Preview 3.1".
* The AMD ROCm Platform ``hipcc`` compiler was identifed by CMake 3.21.0
* The AMD ROCm Platform ``hipcc`` compiler was identified by CMake 3.21.0
through 3.21.2 as a distinct compiler with id ``ROCMClang``. This has
been removed because it caused regressions. Instead:

View File

@@ -12,7 +12,7 @@ The primary purpose of this variable is to facilitate integration between
:command:`find_package` and :command:`FetchContent_MakeAvailable`. The latter
command may create files in the ``CMAKE_FIND_PACKAGE_REDIRECTS_DIR`` directory
when it populates a dependency. This allows subsequent calls to
:command:`find_package` for the same dependency to re-use the populated
:command:`find_package` for the same dependency to reuse the populated
contents instead of trying to satisfy the dependency from somewhere external
to the build. Projects may also want to write files into this directory in
some situations (see :ref:`FetchContent-find_package-integration-examples`

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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

View File

@@ -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

View File

@@ -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,

View File

@@ -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)

View File

@@ -81,7 +81,7 @@ modules:
.. command:: env_module
Execute an aribitrary module command:
Execute an arbitrary module command:
.. code-block:: cmake

View File

@@ -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)

View File

@@ -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.

View File

@@ -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})

View File

@@ -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()

View File

@@ -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"

View File

@@ -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()

View File

@@ -962,15 +962,15 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
"== .*[0-9,]+ bytes in [0-9,]+ blocks are still reachable"
" in loss record [0-9,]+ of [0-9,]+");
cmsys::RegularExpression vgUMC(
"== .*Conditional jump or move depends on uninitialised value\\(s\\)");
"== .*Conditional jump or move depends on uninitiali[sz]ed value\\(s\\)");
cmsys::RegularExpression vgUMR1(
"== .*Use of uninitialised value of size [0-9,]+");
"== .*Use of uninitiali[sz]ed value of size [0-9,]+");
cmsys::RegularExpression vgUMR2("== .*Invalid read of size [0-9,]+");
cmsys::RegularExpression vgUMR3("== .*Jump to the invalid address ");
cmsys::RegularExpression vgUMR4(
"== .*Syscall param .* contains "
"uninitialised or unaddressable byte\\(s\\)");
cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitialised");
"uninitiali[sz]ed or unaddressable byte\\(s\\)");
cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitiali[sz]ed");
cmsys::RegularExpression vgIPW("== .*Invalid write of size [0-9,]+");
cmsys::RegularExpression vgABR("== .*pthread_mutex_unlock: mutex is "
"locked by a different thread");

View File

@@ -4,7 +4,7 @@
# Originally it was a macro in the root `CMakeLists.txt` with the comment
# "Simply to improve readability...".
# However, as part of the modernization refactoring it was moved into a
# separate file cuz adding library alises wasn't possible inside the
# separate file cuz adding library aliases wasn't possible inside the
# macro.
#-----------------------------------------------------------------------
@@ -170,7 +170,7 @@ else()
CMAKE_SET_TARGET_FOLDER(cmcurl "Utilities/3rdParty")
CMAKE_SET_TARGET_FOLDER(LIBCURL "Utilities/3rdParty")
if(NOT CMAKE_USE_SYSTEM_NGHTTP2)
# Configure after curl to re-use some check results.
# Configure after curl to reuse some check results.
add_subdirectory(Utilities/cmnghttp2)
CMAKE_SET_TARGET_FOLDER(cmnghttp2 "Utilities/3rdParty")
endif()

View File

@@ -549,7 +549,7 @@ static void CCONV* cmGetSource(void* arg, const char* name)
sf->SourceExtension =
cmSystemTools::GetFilenameLastExtension(sf->FullPath);
// Store the proxy in the map so it can be re-used and deleted later.
// Store the proxy in the map so it can be reused and deleted later.
i = cmCPluginAPISourceFiles.emplace(rsf, std::move(sf)).first;
}
return i->second.get();
@@ -584,7 +584,7 @@ static void* CCONV cmAddSource(void* arg, void* arg2)
sf->SourceName = osf->SourceName;
sf->SourceExtension = osf->SourceExtension;
// Store the proxy in the map so it can be re-used and deleted later.
// Store the proxy in the map so it can be reused and deleted later.
auto* value = sf.get();
cmCPluginAPISourceFiles[rsf] = std::move(sf);
return value;

View File

@@ -181,7 +181,7 @@ guaranteed to be acyclic.
The final list of items produced by this procedure consists of the
original user link line followed by minimal additional items needed to
satisfy dependencies. The final list is then filtered to de-duplicate
items that we know the linker will re-use automatically (shared libs).
items that we know the linker will reuse automatically (shared libs).
*/

View File

@@ -2591,7 +2591,7 @@ std::string cmComputeLinkInformation::GetRPathString(bool for_install) const
// If the rpath will be replaced at install time, prepare space.
if (!for_install && this->RuntimeUseChrpath) {
if (!rpath.empty()) {
// Add one trailing separator so the linker does not re-use the
// Add one trailing separator so the linker does not reuse the
// rpath .dynstr entry for a symbol name that happens to match
// the end of the rpath string.
rpath += this->GetRuntimeSep();

View File

@@ -59,7 +59,7 @@ void cmExtraCodeLiteGenerator::Generate()
this->GlobalGenerator->GetProjectMap();
// loop projects and locate the root project.
// and extract the information for creating the worspace
// and extract the information for creating the workspace
// root makefile
for (auto const& it : projectMap) {
cmLocalGenerator* lg = it.second[0];

View File

@@ -70,7 +70,7 @@ bool cmFileTimes::Load(std::string const& fileName)
{
std::unique_ptr<Times> ptr;
if (this->IsValid()) {
// Invalidate this and re-use times
// Invalidate this and reuse times
ptr.swap(this->times);
} else {
ptr = cm::make_unique<Times>();

View File

@@ -7014,7 +7014,7 @@ cmLinkInterface const* cmGeneratorTarget::GetLinkInterface(
cmHeadToLinkInterfaceMap& hm = this->GetHeadToLinkInterfaceMap(config);
// If the link interface does not depend on the head target
// then re-use the one from the head we computed first.
// then reuse the one from the head we computed first.
if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) {
head = hm.begin()->first;
}
@@ -7142,7 +7142,7 @@ const cmLinkInterfaceLibraries* cmGeneratorTarget::GetLinkInterfaceLibraries(
: this->GetHeadToLinkInterfaceMap(config));
// If the link interface does not depend on the head target
// then re-use the one from the head we computed first.
// then reuse the one from the head we computed first.
if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) {
head = hm.begin()->first;
}
@@ -7664,7 +7664,7 @@ const cmLinkInterface* cmGeneratorTarget::GetImportLinkInterface(
: this->GetHeadToLinkInterfaceMap(config));
// If the link interface does not depend on the head target
// then re-use the one from the head we computed first.
// then reuse the one from the head we computed first.
if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) {
headTarget = hm.begin()->first;
}
@@ -8224,7 +8224,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
: this->GetHeadToLinkImplementationMap(config));
// If the link implementation does not depend on the head target
// then re-use the one from the head we computed first.
// then reuse the one from the head we computed first.
if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) {
head = hm.begin()->first;
}

Some files were not shown because too many files have changed in this diff Show More