summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cuda-rules-override'Brad King2021-06-231-0/+19
|\ | | | | | | | | | | | | 1d9009c27a CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA] Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6253
| * CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA]Seth R Johnson2021-06-221-0/+19
| | | | | | | | | | This is implemented by other languages, and is documented for all languages. This was accidentally left out of CUDA.
* | CMake Nightly Date StampKitware Robot2021-06-231-1/+1
| |
* | Merge topic 'cmsystemtools-multiple-formats'Brad King2021-06-221-76/+139
|\ \ | | | | | | | | | | | | | | | | | | 2e1149874d cmSystemTools: Support multiple binary formats Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6239
| * | cmSystemTools: Support multiple binary formatsAlex Richardson2021-06-211-76/+139
| | | | | | | | | | | | | | | This prepares the code to handle both the ELF and XCOFF being enabled by trying to parse an ELF file first and if that fails falling back to XCOFF.
* | | CMake Nightly Date StampKitware Robot2021-06-221-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.20' into release-3.21Brad King2021-06-211-0/+7
| |\ \
* | \ \ Merge branch 'release-3.20'Brad King2021-06-211-0/+7
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.20.5v3.20.5Brad King2021-06-211-1/+1
| | | |
| * | | Help: Add 3.20 release note section for 3.20.{3,4,5}Brad King2021-06-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Make it clear that the notes for these patch releases were not forgotten, and that there were simply no changes to documented features or interfaces.
* | | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.20' into release-3.21Brad King2021-06-210-0/+0
| |\ \ \ | | |/ /
* | | | Merge branch 'release-3.20'Brad King2021-06-210-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'test-xcode-13' into release-3.20Brad King2021-06-212-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6248
| * \ \ \ Merge branch 'ep-git-update-commit-ref' into release-3.20Brad King2021-06-211-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6249
* | \ \ \ \ Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'ep-git-update-commit-ref' into release-3.21Brad King2021-06-211-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 360ff17dc6 ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6249
* | | | | | Merge topic 'ep-git-update-commit-ref'Brad King2021-06-211-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 360ff17dc6 ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6249
| * | | | | ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutionsCraig Scott2021-06-201-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5e941a545b (ExternalProject: Ensure git fetch if updating to hash we don't have yet, 2021-05-09), the form ${ref}^{commit} was used to ensure the ref was treated as a commit. When running under a MSYS2 or Cygwin shell, the {commit} part can be translated by the shell, leaving it as ${ref}^commit, which git doesn't understand. Use the equivalent but safer form ${ref}^0, since it won't be subject to the shell substitution issue. Fixes: #22299
* | | | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'test-xcode-13' into release-3.21Brad King2021-06-212-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6248
* | | | | Merge topic 'test-xcode-13'Brad King2021-06-212-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6248
| * | | | Tests: Fix xcode version detection for Xcode 13 on ARMBrad King2021-06-182-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `xcode -version` on an ARM box prints content to stderr: objc[...]: Class ... is implemented in both... One of the two will be used. Which one is undefined. Capture and parse only stdout. Otherwise we might configure test behavior for the wrong version of Xcode.
* | | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'tutorial-sphinx-targets' into release-3.21Brad King2021-06-2112-0/+52
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73898c4922 Tutorial: Make code snippets linkable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6247
* | \ \ \ Merge topic 'tutorial-sphinx-targets'Brad King2021-06-2112-0/+52
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 73898c4922 Tutorial: Make code snippets linkable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6247
| * | | | Tutorial: Make code snippets linkableBrad King2021-06-1812-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 9e5bbb69ea (Tutorial: Add captions for code blocks, 2021-06-11) to also add a Sphinx named target to code blocks. Name each target after the change the code block makes.
* | | | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-source_group-scope' into release-3.21Brad King2021-06-211-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2abce79409 Help: Clarify the usage scope of source_group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6246
* | \ \ \ \ Merge topic 'doc-source_group-scope'Brad King2021-06-211-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2abce79409 Help: Clarify the usage scope of source_group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6246
| * | | | | Help: Clarify the usage scope of source_groupHeiko Thiel2021-06-181-0/+3
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #18856
* | | | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'GNUInstallDirs-alpine' into release-3.21Brad King2021-06-211-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37b24e0bed GNUInstallDirs: don't use lib64 on Alpine Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6244
* | \ \ \ \ Merge topic 'GNUInstallDirs-alpine'Brad King2021-06-211-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37b24e0bed GNUInstallDirs: don't use lib64 on Alpine Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6244
| * | | | | GNUInstallDirs: don't use lib64 on Alpine LinuxNatanael Copa2021-06-181-0/+1
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #22318
* | | | | Merge topic 'FindPkgConfig-PKG_CONFIG-args'Brad King2021-06-216-5/+93
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35d3e00e4e FindPkgConfig: split args if loaded from environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6222
| * | | | | FindPkgConfig: split args if loaded from environmentChristopher Degawa2021-06-186-5/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's common for some people to use the PKG_CONFIG environment variable to not only load a custom pkg-config/pkgconf but also to load some default arguments such as `--static` or `--keep-system-libs` which often worked since shell scripts would call `$PKG_CONFIG --libs pkg` without quotes, but this breaks FindPkgConfig since it uses the full string as `argv[0]` and might try looking for a binary called `pkgconf --static`, instead of looking for `pkgconf` and adding `--static` as the `argv[1]` Additionally adds RunCMake.FindPkgConfig ARGN test case Fixes: #22305 Signed-off-by: Christopher Degawa <ccom@randomderp.com>
* | | | | | Merge topic 'ctest_runtime_labels'Brad King2021-06-217-0/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd38749fd4 ctest: allow test output to add labels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6234
| * | | | | | ctest: allow test output to add labelsZack Galbreath2021-06-177-0/+83
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Parse test output for <CTestLabel>...</CTestLabel>. If found, add this value to the list of labels associated with this test.
* | | | | | Merge topic 'msvc-isystem'Brad King2021-06-2111-22/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f29e1874ad Compiler/MSVC: use the `-external:I` flag for system includes 5a5c85dffd Tests/IncludeDirectories: support MSVC in system include tests 399a3204bb Tests/IncludeDirectories: align sibling predicates 20ab49193b Tests/IncludeDirectories: factor out applying flags to targets 809f7b0c3a Tests/IncludeDirectories: fix copy pasta for otherlib b094324948 Tests/IncludeDirectories: Include system headers via angle brackets 8f63f3b04e cmVisualStudio10TargetGenerator: remove unused variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Waechter <greenjava@gmail.com> Acked-by: DE-VS wenglor <devs.wenglor@gmail.com> Merge-request: !4766
| * | | | | | Compiler/MSVC: use the `-external:I` flag for system includesBen Boeckel2021-06-184-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See: #17904
| * | | | | | Tests/IncludeDirectories: support MSVC in system include testsBen Boeckel2021-06-173-12/+27
| | | | | | |
| * | | | | | Tests/IncludeDirectories: align sibling predicatesBen Boeckel2021-06-171-1/+2
| | | | | | |
| * | | | | | Tests/IncludeDirectories: factor out applying flags to targetsBen Boeckel2021-06-171-6/+10
| | | | | | |
| * | | | | | Tests/IncludeDirectories: fix copy pasta for otherlibBen Boeckel2021-06-171-1/+1
| | | | | | |
| * | | | | | Tests/IncludeDirectories: Include system headers via angle bracketsBrad King2021-06-173-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is typically how projects include them, and cl's `-external:{I,W}` flags suppress warnings only when included through angle brackets.
| * | | | | | cmVisualStudio10TargetGenerator: remove unused variableBen Boeckel2021-06-171-2/+0
| |/ / / / /
* | | | | | Merge branch 'release-3.21'Brad King2021-06-210-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'compiler-id-lang-vars' into release-3.21Brad King2021-06-211-6/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c8eb357738 CompilerId: Tolerate variables named for languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6243