summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-dir-args'Brad King2022-03-0350-31/+85
|\ | | | | | | | | | | | | | | | | | | | | d2e9478321 Tests: Add RunCMake.CommandLine ExplicitiDirs explicit work directory 78e8f11456 cmake: Correct regression in `-B <dir> <src_dir>` 4091d5c58c Tests: Verify RunCMake.CommandLine ExplicitDirs source/build dirs 1b97f8f35c Tests: Clarify RunCMake.CommandLine ExplicitDirs case names Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7030
| * Tests: Add RunCMake.CommandLine ExplicitiDirs explicit work directoryBrad King2022-03-021-0/+6
| | | | | | | | | | | | | | Verify that the work directory is not selected as the source or build tree. Issue: #23285
| * cmake: Correct regression in `-B <dir> <src_dir>`Robert Maynard2022-03-022-1/+2
| | | | | | | | Fixes: #23285
| * Tests: Verify RunCMake.CommandLine ExplicitDirs source/build dirsBrad King2022-03-0223-0/+47
| |
| * Tests: Clarify RunCMake.CommandLine ExplicitDirs case namesBrad King2022-03-0227-30/+30
| |
* | Merge topic 'ci-continuous'Brad King2022-03-032-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | bba3d65bb6 ci: add fedora35-ninja build and test jobs in continuous pipeline e3519aced4 ci: configure rules to enable dependent jbos in continuous pipeline Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7034
| * | ci: add fedora35-ninja build and test jobs in continuous pipelineBrad King2022-03-021-0/+4
| | |
| * | ci: configure rules to enable dependent jbos in continuous pipelineBrad King2022-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Apply the rules from commit ff72dbfb14 (gitlab-ci: configure rules to enable continuous builds of staged MRs, 2020-09-30, v3.19.0-rc1~70^2~1) and commit 71665c8cb9 (gitlab-ci: Clarify conditions enabling jobs for continuous build of stage, 2021-05-05, v3.21.0-rc1~218^2) to dependent jobs too.
* | | Merge topic 'ci-inplace'Brad King2022-03-039-27/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b88f7aad63 ci: add nightly CI job to build CMake in-place 2a7ac62c04 ci: Compute processor count earlier in ctest_standalone.cmake 1613d87dee ci: Rename ctest_test_external.cmake to ctest_standalone.cmake ac37e99453 ci: Rename variable CMake_SKIP_INSTALL to CMAKE_CI_NO_INSTALL Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7033
| * | | ci: add nightly CI job to build CMake in-placeBrad King2022-03-026-2/+51
| | | |
| * | | ci: Compute processor count earlier in ctest_standalone.cmakeBrad King2022-03-021-8/+8
| | | | | | | | | | | | | | | | Compute it early enough to use in the configure step.
| * | | ci: Rename ctest_test_external.cmake to ctest_standalone.cmakeBrad King2022-03-024-10/+10
| | | | | | | | | | | | | | | | | | | | The script is a standalone ctest script that runs all steps. It can be used for more than just external tests.
| * | | ci: Rename variable CMake_SKIP_INSTALL to CMAKE_CI_NO_INSTALLBrad King2022-03-023-7/+7
| |/ / | | | | | | | | | The latter follows our convention for other variable names.
* | | Merge branch 'release-3.23'Brad King2022-03-030-0/+0
|\ \ \
| * \ \ Merge topic 'update-kwsys' into release-3.23Brad King2022-03-031-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a20ad92022 KWSys: SystemInformation: Add Zhaoxin x86 processor kh40000 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7032
* | \ \ \ Merge topic 'update-kwsys'Brad King2022-03-031-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b256a6bbf Merge branch 'backport-kwsys-SystemInformation-zhaoxin-kh40000' a20ad92022 KWSys: SystemInformation: Add Zhaoxin x86 processor kh40000 17b4fa5dab Merge branch 'upstream-KWSys' into update-kwsys 9deb2d6013 KWSys 2022-03-02 (d3bbb6b7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7032
| * \ \ \ \ Merge branch 'backport-kwsys-SystemInformation-zhaoxin-kh40000'Brad King2022-03-020-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | KWSys: SystemInformation: Add Zhaoxin x86 processor kh40000Joker-Van2022-03-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWSys commit `dfec20c95` (SystemInformation: Add Zhaoxin x86 processor kh40000, 2022-03-02) to the CMake 3.23 release branch.
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-03-021-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-03-02 (d3bbb6b7)
| | * | | | | KWSys 2022-03-02 (d3bbb6b7)KWSys Upstream2022-03-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit d3bbb6b77cbd21d9a3bf8db9bdf2ad465d99feab (master). Upstream Shortlog ----------------- Joker-Van (1): dfec20c9 SystemInformation: Add Zhaoxin x86 processor kh40000
* | | | | | | CMake Nightly Date StampKitware Robot2022-03-031-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'release-3.23'Brad King2022-03-020-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'cuda-arch-all' into release-3.23Brad King2022-03-023-42/+45
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2796d6eeca CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+ e450d55552 Help: Update CUDA_ARCHITECTURES docs for generic all/all-major support fe64c49e72 CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7026
* | \ \ \ \ \ Merge topic 'cuda-arch-all'Brad King2022-03-023-42/+45
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2796d6eeca CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+ e450d55552 Help: Update CUDA_ARCHITECTURES docs for generic all/all-major support fe64c49e72 CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7026
| * | | | | | CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+Brad King2022-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 8f64df0a7c (CUDA: Generic all and all-major support, 2021-12-19, v3.23.0-rc1~23^2) broke our architecture verification checks when using `-arch={all,all-major}` with NVCC 11.5+. If we test the compiler with `-arch={all,all-major}`, we have no expected list of architectures, so skip the check. Fixes: #23278
| * | | | | | Help: Update CUDA_ARCHITECTURES docs for generic all/all-major supportBrad King2022-03-011-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8f64df0a7c (CUDA: Generic all and all-major support, 2021-12-19, v3.23.0-rc1~23^2), these special values do not require any specific compiler or version. While at it, re-organize CUDA_ARCHITECTURES special value documentation. Move the `versionadded` markup inside each special value so we can add more in future versions.
| * | | | | | CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logicBrad King2022-03-012-33/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the logic checking `CMAKE_CUDA_ARCHITECTURES` special values. Switch on the value first, and then make other decisions for each case. This makes room for other special values to be added later.
* | | | | | | Merge topic 'windows-symlink-dir'Brad King2022-03-021-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5101d586c4 Windows: Prefer junctions for directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7013
| * | | | | | | Windows: Prefer junctions for directory symlinksSergei Kryvonos2022-03-011-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the approach added by commit afb7f6e4ff (cmake: Add '-E create_symlink' support on Windows, 2018-06-11, v3.13.0-rc1~75^2) to use junctions, as suggested [here](https://superuser.com/a/1291446/140450). This allows them to work under security limitations on Windows. Fixes: #23257
* | | | | | | | Merge branch 'release-3.23'Brad King2022-03-020-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-presets-v4' into release-3.23Brad King2022-03-025-43/+80
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6404751176 Help: Improve wording and structure related to preset includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7028
* | \ \ \ \ \ \ \ Merge topic 'doc-presets-v4'Brad King2022-03-025-43/+80
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6404751176 Help: Improve wording and structure related to preset includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7028
| * | | | | | | | Help: Improve wording and structure related to preset includesCraig Scott2022-03-025-43/+80
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encourage placing preset includes near the beginning of a preset file and ensure the example shows that usage. Move the prose discussing includes to its own section to improve discoverability and break up paragraphs to make each main point harder to miss. Also clarify ${sourceDir} to remove any ambiguity with regard to its meaning in included files. Issue: #23214
* | | | | | | | Merge branch 'release-3.23'Brad King2022-03-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'find_file_frameworks_debug_output' into release-3.23Brad King2022-03-022-4/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3354d52e3d find_file: Fix blank line instead of framework path in debug output Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7024
* | \ \ \ \ \ \ \ Merge topic 'find_file_frameworks_debug_output'Brad King2022-03-022-4/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3354d52e3d find_file: Fix blank line instead of framework path in debug output Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7024
| * | | | | | | | find_file: Fix blank line instead of framework path in debug outputCraig Scott2022-02-282-4/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point printing a blank line if FindHeaderInFramework() returns an empty string. Pass in the debug object to that function instead so it can record the actual paths it tests in the debug output directly.
* | | | | | | | Merge branch 'release-3.23'Brad King2022-03-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'file-set-no-custom-targets' into release-3.23Brad King2022-03-026-1/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad41c9cd11 target_sources(): Prohibit FILE_SET on custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7027
* | | | | | | | Merge topic 'file-set-no-custom-targets'Brad King2022-03-026-1/+16
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ad41c9cd11 target_sources(): Prohibit FILE_SET on custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7027
| * | | | | | target_sources(): Prohibit FILE_SET on custom targetsKyle Edwards2022-02-286-1/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #23262
* | | | | | CMake Nightly Date StampKitware Robot2022-03-021-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'symlink-build-under-source'Brad King2022-03-017-43/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d33b12d84b Add support for build tree symlink inside source tree 43416c48ed cmOutputConverter: Always set relative path top source and binary together de766bc7e0 Xcode: Fix support for source tree symlink inside build tree 55db2cf1e5 Makefiles: Fix "make depend" with add_custom_command DEPFILE Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7020
| * | | | | Add support for build tree symlink inside source treeBrad King2022-02-283-10/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c564a3e3ff (Ninja: Always compile sources using absolute paths, 2021-05-19, v3.21.0-rc1~129^2), both the Ninja and Makefile generators pass source files and include directories to the compiler as absolute paths. However, in some other contexts within generated build systems, we generate paths that may be relative or absolute. In these contexts, we prefer relative paths, but avoid them when they contain a `../` sequence that leaves both the build tree and the source tree: * When the build tree is outside of the source tree, all paths to the source tree are absolute. * When the build tree is inside the source tree, we previously assumed that it is a real directory such that exiting the build tree with `../` enters the source tree. This allowed paths to the source tree to be relative to the build tree. In the latter case, we previously did not support using a symbolic link inside the source tree to point at the build tree. This is because relative paths to the source tree would be generated with `../` sequences leaving the build tree, but they would jump to the parent of the real build tree, which is not the source tree. Fix this by requiring that `../` sequences stay inside the build tree even if its path appears to be inside the source tree. When the build tree is inside the source tree, all paths to the source tree are now absolute. For consistency, this applies regardless of whether the path to the build tree contains a symbolic link. Fixes: #21819
| * | | | | cmOutputConverter: Always set relative path top source and binary togetherBrad King2022-02-285-22/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to set both at once so we have a single place in the code that knows both have been set.
| * | | | | Xcode: Fix support for source tree symlink inside build treeBrad King2022-02-282-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 61495cdaae (Fix Xcode project references to the source tree, 2009-09-22, v2.8.0~43) we force source file references to use relative paths from the source tree. If the source tree path is a symbolic link inside the build tree, the relative `../` sequence goes to the wrong place. The problem with debug breakpoints motivating that change does not seem to occur in modern Xcode versions, so update the logic to use a relative path only when it does not need to start in any `../` sequence.
| * | | | | Makefiles: Fix "make depend" with add_custom_command DEPFILEBrad King2022-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cfd8a5ac1f (Makefiles: Add support of DEPFILE for add_custom_command, 2020-12-04, v3.20.0-rc1~237^2~1) we store in `CMAKE_DEPENDS_DEPENDENCY_FILES` an empty string as the source file with which the dependencies of a custom command depfile are associated. When this list is later expanded by `make depend`, the empty element is removed and breaks list indexing. Fix the list expansion to preserve empty elements.
* | | | | | Merge topic 'genex-LINK_GROUP'Brad King2022-03-01135-195/+1907
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a81ea1f12 Genex-LINK_GROUP: Add possibility to group libraries at link step a9928eb4a5 SunPro C: ensure LINKER: prefix is usable for all versions 01ff75b2ff cmComputeDepends::LinkEntry: introduce enum to specify item type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7005
| * | | | | | Genex-LINK_GROUP: Add possibility to group libraries at link stepMarc Chevrier2022-02-28134-184/+1881
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23121
| * | | | | | SunPro C: ensure LINKER: prefix is usable for all versionsMarc Chevrier2022-02-271-2/+7
| | | | | | |
generated by cgit v0.12 at 2025-02-02 19:13:18 (GMT)