summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVCCristian Adam2021-11-081-3/+3
| | | | | | | | The copy_idb_pdb.cmake script would be executed for every configuration for all configurations. Debug would still want to get the RelWithDebInfo files, and the other way around.
* 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
* | \ \ \ \ \ \ Merge topic 'corret_nvhpc_fortran_compile_deps'Brad 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
| * | | | | | | NVHPC: only use '-MD' for the C and CXX languagesRobert Maynard2021-10-063-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake shouldn't use '-MD' for nvfortran to generate dependency information. Fixes #22723
* | | | | | | | CMake Nightly Date StampKitware Robot2021-10-071-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.21'Brad King2021-10-060-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'bootstrap-qt6' into release-3.21Brad King2021-10-062-2/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Andrew Maclean <andrew.amaclean@gmail.com> Merge-request: !6593
* | \ \ \ \ \ \ Merge topic 'bootstrap-qt6'Brad King2021-10-062-2/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Andrew Maclean <andrew.amaclean@gmail.com> Merge-request: !6593