Commit Graph

54848 Commits

Author SHA1 Message Date
Kitware Robot bf35ce70d0 CMake Nightly Date Stamp 2021-10-11 00:01:12 -04:00
Kitware Robot da98131acb CMake Nightly Date Stamp 2021-10-10 00:01:05 -04:00
Kitware Robot 3874568dca CMake Nightly Date Stamp 2021-10-09 00:01:18 -04:00
Brad King 3068ea834f Begin post-3.22 development 2021-10-08 10:05:53 -04:00
Brad King 89c4dd6242 Merge branch 'release-3.22' 2021-10-08 10:05:28 -04:00
Brad King 975b935129 Begin 3.22 release versioning 2021-10-08 10:05:02 -04:00
Brad King e137ce0a52 gitlab-ci: Drop package pipeline upload jobs for release branch
The package pipeline for release versions should not upload packages
automatically to our archive of nightly development versions.
2021-10-08 10:01:41 -04:00
Brad King e5a97f83b3 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2021-10-08 10:00:22 -04:00
Brad King 8c27ccd945 Merge topic 'doc-3.22-relnotes'
9f0b52b8e6 Help: Update Sphinx versionadded directives for 3.22 release
c632a7105c Help: Organize and revise 3.22 release notes
48e503ec78 Help: Consolidate 3.22 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6606
2021-10-08 09:58:19 -04:00
Brad King daab8b891c Merge topic 'tutorial_update_step_4'
5a86ce5428 Tutorial: Step 4 improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6564
2021-10-08 09:50:04 -04:00
Brad King 9fdfc5dd44 Merge topic 'find-blas-lapack-cleanup'
635f2c87f5 FindBLAS: Fix EML and ArmPL indentations
816dc1cb19 FindBLAS: Replace set(A val) with string(APPEND)
a7843faa20 FindLAPACK: Replace set(A val) with string(APPEND)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6605
2021-10-08 09:49:21 -04:00
Brad King b1d27da3ec Merge branch 'release-3.21' 2021-10-08 09:47:47 -04:00
Brad King 2fd749fd4b Merge branch 'release-3.20' 2021-10-08 09:47:45 -04:00
Brad King fd0bbc37fa Merge branch 'release-3.19' 2021-10-08 09:47:43 -04:00
Brad King f6ec46a543 Merge branch 'release-3.20' into release-3.21 2021-10-08 09:47:33 -04:00
Brad King de99806587 Merge branch 'release-3.19' into release-3.20 2021-10-08 09:46:51 -04:00
Brad King ac910db867 Merge branch 'revert-debian-libexec' into release-3.20
Merge-request: !6607
2021-10-08 09:46:39 -04:00
Brad King c352d16aaf Merge branch 'revert-debian-libexec' into release-3.19
Merge-request: !6607
2021-10-08 09:46:09 -04:00
Brad King 6d1f6ebd20 Merge branch 'release-3.21' 2021-10-08 09:45:12 -04:00
Brad King b7c91c74eb Merge topic 'revert-debian-libexec'
6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6607
2021-10-08 09:45:12 -04:00
Brad King 1a47305edf Merge topic 'revert-debian-libexec' into release-3.21
6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6607
2021-10-08 09:45:10 -04:00
Kitware Robot a8c72f6257 CMake Nightly Date Stamp 2021-10-08 00:01:10 -04:00
Timo Röhling 6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR
Revert commit 798c1c3192 (GNUInstallDirs: Comply with Debian Policy on
LIBEXECDIR, 2020-10-08, v3.19.0-rc1~11^2).

The Debian Policy builds upon FHS 3.0 and permits installing to
`/usr/libexec`. While Policy does grant an additional exception for
applications to use a single subdirectory of `/usr/lib/<triplet>`, this
is not meant to replace `/usr/libexec` as valid target.

Fixes: #22731
2021-10-07 14:29:18 -04:00
Joseph Snyder 5a86ce5428 Tutorial: Step 4 improvements
Small changes to the text and CMake code for the fourth step of the
tutorial:

* Remove parameter from endfunction call
* Standardize on "binary directory" for test location
* Add additional information about a Release build.

Issue: #22663
2021-10-07 11:53:51 -04:00
Brad King 9f0b52b8e6 Help: Update Sphinx versionadded directives for 3.22 release
Run the script:

    Utilities/Sphinx/update_versions.py --since v3.21.0 --overwrite

Manually select updates that really belong to the 3.22 release, as
against adding documentation for previously-existing entities.
2021-10-07 11:25:51 -04:00
Brad King c632a7105c Help: Organize and revise 3.22 release notes
Add section headers similar to the 3.21 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2021-10-07 11:25:45 -04:00
Brad King 48e503ec78 Help: Consolidate 3.22 release notes
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.22.rst`.
2021-10-07 09:46:29 -04:00
Igor S. Gerasimov 635f2c87f5 FindBLAS: Fix EML and ArmPL indentations 2021-10-07 09:35:43 -04:00
Igor S. Gerasimov 816dc1cb19 FindBLAS: Replace set(A val) with string(APPEND) 2021-10-07 09:33:51 -04:00
Igor S. Gerasimov a7843faa20 FindLAPACK: Replace set(A val) with string(APPEND) 2021-10-07 09:33:51 -04:00
Brad King 24fb43e3e7 Merge topic 'math_libs_include'
32574814c7 FindCUDAToolkit: Fix missing sibling include directory for math libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6591
2021-10-07 09:23:08 -04:00
Brad King 6e037a04e7 Merge topic 'FindJasper-imported-target'
6e8754c625 FindJasper: Add IMPORTED target
bdbce845cd FindJasper: Add JASPER_INCLUDE_DIRS result variable
7f8413c309 FindJasper: Modernize documentation layout
524205a7a5 FindJasper: Modernize code layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4633
2021-10-07 09:22:11 -04:00
Brad King eb724e938a Merge topic 'file-install-follow-symlink-chain'
9dcf924093 Tests: Skip RunCMake.file INSTALL-FOLLOW_SYMLINK_CHAIN case on Cygwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6603
2021-10-07 09:20:58 -04:00
Brad King fbf47ee8be Merge topic 'ci-asan'
915ef42cab gitlab-ci: Fix asan test job rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6601
2021-10-07 09:19:49 -04:00
Brad King 523039ce12 Merge topic 'ci-nightly-ninja'
b5a59251cb gitlab-ci: Try upstream ninja development branch in some nightly jobs
6dd9245635 gitlab-ci: Add cmake and ninja to PATH incrementally

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6599
2021-10-07 09:19:07 -04:00
Brad King f175a62fcc Merge topic 'xcode-lang-defaults'
3add62462c Xcode: Fix detection of default language standard when given -std= flags
5c4424e5b7 CMakeDetermineCompilerId: Tolerate variables named for languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6598
2021-10-07 09:12:45 -04:00
Brad King 572217ee6c Merge branch 'release-3.21' 2021-10-07 09:11:21 -04:00
Brad King 0a863c71d8 Merge topic 'corret_nvhpc_fortran_compile_deps'
1a828043b7 NVHPC: only use '-MD' for the C and CXX languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6602
2021-10-07 09:11:21 -04:00
Brad King 2104c198bd Merge topic 'corret_nvhpc_fortran_compile_deps' into release-3.21
1a828043b7 NVHPC: only use '-MD' for the C and CXX languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6602
2021-10-07 09:11:20 -04:00
Kitware Robot b00d14ac5e CMake Nightly Date Stamp 2021-10-07 00:01:12 -04:00
Brad King 9dcf924093 Tests: Skip RunCMake.file INSTALL-FOLLOW_SYMLINK_CHAIN case on Cygwin
This case was added by commit e3ff7ced63 (file(INSTALL): Add
FOLLOW_SYMLINK_CHAIN argument, 2019-05-16, v3.15.0-rc1~103^2).
Skip it on Cygwin because it fails due to `foo/../` pairs being
flattened away in symlinks.
2021-10-06 16:38:05 -04:00
Robert Maynard 1a828043b7 NVHPC: only use '-MD' for the C and CXX languages
CMake shouldn't use '-MD' for nvfortran to generate dependency information.

Fixes #22723
2021-10-06 16:21:29 -04:00
Brad King 915ef42cab gitlab-ci: Fix asan test job rules
The job runs dependently after the asan build job.  Fix the rules for
the job added by commit 20bc209a0c (gitlab-ci: add clang asan job,
2021-06-07, v3.21.0-rc1~61^2).
2021-10-06 15:42:12 -04:00
Brad King b5a59251cb gitlab-ci: Try upstream ninja development branch in some nightly jobs 2021-10-06 13:38:57 -04:00
Brad King 6dd9245635 gitlab-ci: Add cmake and ninja to PATH incrementally 2021-10-06 13:22:32 -04:00
Hiroshi Miura 6e8754c625 FindJasper: Add IMPORTED target
Fixes: #20601
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-10-06 11:28:09 -04:00
Hiroshi Miura bdbce845cd FindJasper: Add JASPER_INCLUDE_DIRS result variable
The `JASPER_INCLUDE_DIR` cache entry is not supposed to be the public
result variable.
2021-10-06 11:20:54 -04:00
Hiroshi Miura 7f8413c309 FindJasper: Modernize documentation layout 2021-10-06 11:20:38 -04:00
Hiroshi Miura 524205a7a5 FindJasper: Modernize code layout 2021-10-06 11:20:35 -04:00
Brad King 3add62462c Xcode: Fix detection of default language standard when given -std= flags
If one uses `CFLAGS='-std=...'` or `CXXFLAGS='-std=...'` then the given
`-std=` flag(s) will always be used.  That effectively changes the
compiler default standard level and extension settings.  Fix the
Xcode generator's compiler id logic to preserve any `-std=` flag
so that the proper defaults are detected.

This problem was exposed by commit 4a0485be7f (cmStandardLevelResolver:
Avoid unnecessary flags, fix unset level logic, 2021-05-29), which
changed the logic to not pass any `-std=` flag if the standard level
and extension settings requested by the project match the default
(`stdIt <= defaultStdIt` became `stdIt < defaultStdIt`).  The new
logic assumes the detected default standard matches what will actually
happen when the project is generated.
2021-10-06 10:36:39 -04:00