summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* LCC: Add dedicated support for MCST LCC compilermakise-homura2021-10-1580-96/+521
| | | | | | | | | | | | | | | | | | | | | Divert LCC compiler as a new one, instead of treating it as GNU. Since old times, Elbrus C/C++/Fortran Compiler (LCC) by MCST has been passing checks for GNU compilers, so it has been identified as GNU. Now, with intent of seriously upstreaming its support, it has been added as a separate LCC compiler, and its version displays not a supported GCC version, but LCC version itself (e.g. LCC 1.25.19 instead of GNU 7.3.0). This commit adds its support for detection, and also converts basically every check like 'is this compiler GNU?' to 'is this compiler GNU or LCC?'. The only places where this check is untouched, is where it regards other platforms where LCC is unavailable (primarily non-Linux), and where it REALLY differs from GNU compiler. Note: this transition may break software that are already ported to Elbrus, but hardly relies that LCC will be detected as GNU; still such software is not known.
* CPack/DEB: deal with broken dpkg-shlibdeps on E2K architecturemakise-homura2021-10-152-1/+10
| | | | | | | | | | | "OS Elbrus" (OSL for short), a reference Linux distro for E2K (Elbrus) platform may have broken dpkg-shlibdeps, that doesn't specify dependencies correctly. In this case, the only reliable way is to explicitly set dependencies of libc6 and lcc-libs, and then warn user to let him know this list may be incomplete. This commit does that. This fix has no effect on correctly working dpkg-shlibdeps, so when this bug will be fixed in new versions of OSL, CPack will work as expected with these distros.
* Tests/RPM: skip tests tat rely on debugedit if it's not foundmakise-homura2021-10-151-5/+22
| | | | | | There are several tests that run on systems that have rpm installed, but they fail if there's no debugedit installed also. This commit makes these tests being skipped in such case.
* Tests/RunCMake/CommandLine: Deal with locales that are different from Englishmakise-homura2021-10-151-0/+6
| | | | | | | | | | RunCMake/CommandLine has problems when ran using language setting differeng from English. This is due to test outputs being compared to English strings, which comparison obviously fails if this language is set to, e.g. Russian. This commit sets locale as "C" prior to running these tests, so messages while testing are generated in correct language and do not fail checks anymore.
* Begin post-3.22 developmentBrad King2021-10-084-9/+18
|
* Merge branch 'release-3.22'Brad King2021-10-084-19/+10
|\
| * Begin 3.22 release versioningBrad King2021-10-081-3/+3
| |
| * gitlab-ci: Drop package pipeline upload jobs for release branchBrad King2021-10-081-7/+7
| | | | | | | | | | The package pipeline for release versions should not upload packages automatically to our archive of nightly development versions.
| * Help: Drop development topic notes to prepare releaseBrad King2021-10-082-9/+0
|/ | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* Merge topic 'doc-3.22-relnotes'Brad King2021-10-0832-170/+151
|\ | | | | | | | | | | | | | | | | 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
| * Help: Update Sphinx versionadded directives for 3.22 releaseBrad King2021-10-073-0/+6
| | | | | | | | | | | | | | | | | | 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.
| * Help: Organize and revise 3.22 release notesBrad King2021-10-071-69/+89
| | | | | | | | | | Add section headers similar to the 3.21 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * Help: Consolidate 3.22 release notesBrad King2021-10-0729-170/+125
| | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.22.rst`.
* | Merge topic 'tutorial_update_step_4'Brad King2021-10-0810-12/+14
|\ \ | | | | | | | | | | | | | | | | | | 5a86ce5428 Tutorial: Step 4 improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6564
| * | Tutorial: Step 4 improvementsJoseph Snyder2021-10-0710-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'find-blas-lapack-cleanup'Brad King2021-10-082-30/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindBLAS: Fix EML and ArmPL indentationsIgor S. Gerasimov2021-10-071-19/+19
| | | |
| * | | FindBLAS: Replace set(A val) with string(APPEND)Igor S. Gerasimov2021-10-072-8/+8
| | | |
| * | | FindLAPACK: Replace set(A val) with string(APPEND)Igor S. Gerasimov2021-10-071-5/+5
| | |/ | |/|
* | | Merge branch 'release-3.21'Brad King2021-10-080-0/+0
|\ \ \
| * \ \ Merge branch 'release-3.20' into release-3.21Brad King2021-10-080-0/+0
| |\ \ \
* | \ \ \ Merge branch 'release-3.20'Brad King2021-10-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.19' into release-3.20Brad King2021-10-080-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'revert-debian-libexec' into release-3.20Brad King2021-10-082-15/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !6607
* | \ \ \ \ \ Merge branch 'release-3.19'Brad King2021-10-080-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'revert-debian-libexec' into release-3.19Brad King2021-10-082-15/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !6607
* | | | | | | Merge branch 'release-3.21'Brad King2021-10-080-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'revert-debian-libexec' into release-3.21Brad King2021-10-082-15/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6607
* | | | | | | Merge topic 'revert-debian-libexec'Brad King2021-10-082-15/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6607
| * | | | | | GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIRTimo Röhling2021-10-072-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | CMake Nightly Date StampKitware Robot2021-10-081-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'math_libs_include'Brad King2021-10-071-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | FindCUDAToolkit: Fix missing sibling include directory for math librariesSteven Hahn2021-10-051-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22706
* | | | | | | Merge topic 'FindJasper-imported-target'Brad King2021-10-076-26/+117
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | FindJasper: Add IMPORTED targetHiroshi Miura2021-10-066-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20601 Signed-off-by: Hiroshi Miura <miurahr@linux.com>
| * | | | | | | FindJasper: Add JASPER_INCLUDE_DIRS result variableHiroshi Miura2021-10-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `JASPER_INCLUDE_DIR` cache entry is not supposed to be the public result variable.
| * | | | | | | FindJasper: Modernize documentation layoutHiroshi Miura2021-10-061-7/+24
| | | | | | | |
| * | | | | | | FindJasper: Modernize code layoutHiroshi Miura2021-10-061-20/+16
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'file-install-follow-symlink-chain'Brad King2021-10-072-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dcf924093 Tests: Skip RunCMake.file INSTALL-FOLLOW_SYMLINK_CHAIN case on Cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6603
| * | | | | | | Tests: Skip RunCMake.file INSTALL-FOLLOW_SYMLINK_CHAIN case on CygwinBrad King2021-10-062-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'ci-asan'Brad King2021-10-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | gitlab-ci: Fix asan test job rulesBrad King2021-10-061-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | Merge topic 'ci-nightly-ninja'Brad King2021-10-075-2/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | gitlab-ci: Try upstream ninja development branch in some nightly jobsBrad King2021-10-063-0/+19
| | | | | | | |
| * | | | | | | gitlab-ci: Add cmake and ninja to PATH incrementallyBrad King2021-10-062-2/+4
| |/ / / / / /
* | | | | | | Merge topic 'xcode-lang-defaults'Brad King2021-10-071-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Xcode: Fix detection of default language standard when given -std= flagsBrad King2021-10-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | CMakeDetermineCompilerId: Tolerate variables named for languagesBrad King2021-10-061-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'release-3.21'Brad King2021-10-070-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'corret_nvhpc_fortran_compile_deps' into release-3.21Brad King2021-10-073-12/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a828043b7 NVHPC: only use '-MD' for the C and CXX languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6602