summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMakePresets.json: Make --list-presets show presets with no generatorKyle Edwards2021-07-066-13/+23
| | | | Fixes: #22389
* Merge branch 'release-3.20' into release-3.21Brad King2021-07-060-0/+0
|\
| * Merge branch 'backport-3.20-makefile-normalize-depfile' into release-3.20Brad King2021-07-023-6/+17
| |\ | | | | | | | | | Merge-request: !6297
* | \ Merge topic 'makefile-normalize-depfile' into release-3.21Brad King2021-07-063-6/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile' 6a6efdcaed Makefiles: Normalize compiler-generated depfile paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6297
| * \ \ Merge branch 'backport-3.20-makefile-normalize-depfile'Brad King2021-07-023-6/+17
| |\ \ \ | | | |/ | | |/|
| | * | Makefiles: Normalize compiler-generated depfile pathsMarc Chevrier2021-07-023-6/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Makefile generators pass source files and include directories by absolute path to the compiler, the compiler may generate depfile paths relative to the current working directory. For example, `ccache` with `CCACHE_BASEDIR` may transform paths this way. When reading a depfile, convert relative dependencies to absolute paths before placing them in `compiler_depend.make`, which is later evaluated in the top-level build directory. Fixes: #22364
* | | Merge topic 'ci-fixups' into release-3.21Brad King2021-07-0622-28/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE 3ede66e17a Tests: Fix newline matching in several RunCMake.* cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6298
| * | | gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPEBrad King2021-07-024-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e216b9bbd3 (cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable, 2021-06-29), the `CMAKE_BUILD_TYPE` environment variable is interpreted by CMake, and can affect the test suite. Rename our CI config variable to avoid conflict.
| * | | Tests: Fix newline matching in several RunCMake.* casesBrad King2021-07-0218-21/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | The RunCMake infrastructure's `*-stdout.txt` expected output files interpret `\n` as a `\` and `n` rather than a newline. Use a literal newline instead. Otherwise the cases that were trying to match any configuration name via `[^\n]*` would fail on `RelWithDebInfo` because it contains the letter `n`.
* | | Merge topic 'doc-3.21-release' into release-3.21Craig Scott2021-07-062-61/+75
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 24b76eaa93 Help: Improve readability and accuracy of runtime deps-related content 308e5b30c9 Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS option 52dec01729 Help: Add missing versionadded 3.21 for file(RENAME) options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6302
| * | Help: Improve readability and accuracy of runtime deps-related contentCraig Scott2021-07-042-55/+64
| | | | | | | | | | | | | | | | | | Duplicated textual patterns are factored out to make the text more readable. The POST_INCLUDE_FILES and POST_EXCLUDE_FILES were also previously missing from the main syntax block for install(RUNTIME_DEPENDENCY_SET).
| * | Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS optionCraig Scott2021-07-031-6/+7
| | | | | | | | | | | | | | | In particular, mention the mutually exclusive nature with the COMPONENT option. Fix the inconsistent way the versionadded details were added for that text too.
| * | Help: Add missing versionadded 3.21 for file(RENAME) optionsCraig Scott2021-07-031-0/+4
|/ /
* | Merge topic 'cmake-upload-junit-reports' into release-3.21Brad King2021-07-026-9/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | cb5c03ed04 gitlab-ci: upload JUnit reports for builds 722270ff50 ci: update to 3.21.0-rc2 for CI usage Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !6072
| * | gitlab-ci: upload JUnit reports for buildsBen Boeckel2021-06-304-0/+21
| | | | | | | | | | | | | | | GitLab can render test results which come from JUnit files and inform which tests have started failing on an MR.
| * | ci: update to 3.21.0-rc2 for CI usageBen Boeckel2021-06-302-9/+9
| | | | | | | | | | | | This version includes JUnit support in CTest.
* | | Merge topic 'compiler-id-msvc-no-lib' into release-3.21Brad King2021-07-022-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6295
| * | | DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIBBrad King2021-07-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the change from commit c6aaaf066a (DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs, 2021-06-29, v3.21.0-rc2~6^2) to also work with no `LIB` dirs. Add the `-c` flag to compile an object file without linking.
* | | | Merge topic 'help_cstd' into release-3.21Brad King2021-07-021-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c310ff075 Help: Note C_STANDARD values added in CMake 3.21 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6294
| * | | | Help: Note C_STANDARD values added in CMake 3.21Michael Hirsch2021-07-011-1/+20
| |/ / / | | | | | | | | | | | | Issue: #22366
* | | | Merge topic 'doc-vs-fortran' into release-3.21Brad King2021-06-307-14/+21
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | ab06f78182 Help: Document VS generator support for Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6289
| * | | Help: Document VS generator support for Intel FortranBrad King2021-06-307-14/+21
|/ / / | | | | | | | | | | | | | | | | | | Extend the list of project types added by commit a82eb539f0 (Help: Describe the type of Visual Studio projects that can be generated, 2018-08-04, v3.13.0-rc1~227^2) to mention that Fortran projects are supported with Intel compiler integration.
* | | CMake 3.21.0-rc2v3.21.0-rc2Brad King2021-06-301-1/+1
| | |
* | | Merge topic 'CMP0126-WARNING' into release-3.21Brad King2021-06-308-6/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
| * | | CMP0126: Add control for warningsMarc Chevrier2021-06-298-6/+47
| | | | | | | | | | | | | | | | Fixes: #22353
* | | | Merge topic 'fujitsu-clang-findbinutils' into release-3.21Brad King2021-06-302-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ce97c2248 FujitsuClang: Change LTO option from -flto=thin to -flto 3a0effcd16 FujitsuClang: Set CMAKE_<LANG>_COMPILER_AR and CMAKE_<LANG>_COMPILER_RANLIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6281
| * | | | FujitsuClang: Change LTO option from -flto=thin to -fltoYuichiro Utsumi2021-06-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Since -flto=thin is not supported officially in FujitsuClang, change to -flto.
| * | | | FujitsuClang: Set CMAKE_<LANG>_COMPILER_AR and CMAKE_<LANG>_COMPILER_RANLIBYuichiro Utsumi2021-06-291-0/+6
| | |/ / | |/| | | | | | | | | | Fixes: #22337
* | | | Merge topic 'vs-ARM64EC' into release-3.21Brad King2021-06-301-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
| * | | | VS: Add ARM64EC to supported platforms for VS 16 and 17Brad King2021-06-291-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4ea3a88625 (MSVC: Add support for targeting ARM64EC, 2020-12-30, v3.20.0-rc1~121^2) the `ARM64EC` platform was accidentally added to the list for VS 15 (2017) instead of VS 16 (2019). Its omission from the list of platforms was then repeated for VS 17 (2022). Issue: #21724
* | | | Merge topic 'rpm-suggests' into release-3.21Brad King2021-06-304-13/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b53eca317 CPack/RPM: Fix weak dep support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6274
| * | | | CPack/RPM: Fix weak dep supportAlex Sweet2021-06-294-13/+50
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPM 4.11.3 for el7 contains backported support for the RPM weak dep tags. It only supports querying those tags, but rpmbuild can not make use of them. Since CPack relies on rpmbuild --querytags to check for support, this commit switches to rpm --suggests to check for support of weak dependencies. Fixes: #22350
* | | | Merge topic 'tll-out-of-dir' into release-3.21Brad King2021-06-306-7/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e27a76f131 target_link_libraries: Restore transitive out-of-dir linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6285
| * | | | target_link_libraries: Restore transitive out-of-dir linkingBrad King2021-06-296-7/+30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 7f506b95a7 (cmGeneratorTarget: Refactor link item lookup, 2021-05-26, v3.21.0-rc1~103^2~4) accidentally dropped the persistent lookup scope tracking across multiple items that was added by commit f0e67da061 (target_link_libraries: Fix out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2). This broke a transitive out-of-dir linking case not covered by our test suite. Restore the scope tracking and add a test case. Fixes: #22363
* | | | Merge topic 'compiler-id-msvc-has-include' into release-3.21Brad King2021-06-302-0/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | c6aaaf066a DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6284
| * | | DetermineCompiler: Restore identification of MSVC with no INCLUDE dirsBrad King2021-06-292-0/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bd844387df (ROCMClang: Add the ROCm toolkit derived clang compiler to CMake, 2020-08-28, v3.21.0-rc1~66^2~6), our generated compiler id source file contains a preprocessor condition of the form #elif ... && __has_include(...) When MSVC is invoked with no include directories in the `INCLUDE` environment variable or in `-I` flags, its implementation of `__has_include` errors out immediately. This breaks identification of the compiler. Work around the problem by adding a fallback attempt to compile the identification source using a dummy include directory.
* | | Merge topic 'update-kwsys' into release-3.21Brad King2021-06-293-4/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !6266
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-06-283-4/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-06-28 (0648cb1a)
| | * | | KWSys 2021-06-28 (0648cb1a)KWSys Upstream2021-06-283-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0648cb1ac5c91430b190f32319c528345b280dc3 (master). Upstream Shortlog ----------------- Ben Boeckel (2): df91e5f1 EncodingC: use NULL for pointers ab959cd2 SystemInformation: fix typo in comment Björn Esser (2): b4a2a03c testDynamicLoader: Use LIBDL_SO macro if defined. b954dd54 testDynamicLoader: Use LIBC_SO if LIBDL_SO is not defined by glibc anymore.
* | | | | Merge topic 'tests-tolerate-NINJA_STATUS' into release-3.21Brad King2021-06-292-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6271
| * | | | | Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behaviorNAKAMURA Takumi2021-06-282-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | FYI, NINJA_STATUS is "[%f/%t] " by default.
* | | | | | Merge topic 'test-driver-local-var' into release-3.21Brad King2021-06-291-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e3d3c5284 TestDriver: Avoid declaring local variable after statement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6276
| * | | | | | TestDriver: Avoid declaring local variable after statementBrad King2021-06-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move a declaration added by commit 3f6ff4b5db (create_test_sourcelist: add test driver option to run all tests, 2021-04-27, v3.21.0-rc1~257^2) into its own scope.
* | | | | | | Merge topic 'curl-schannel-ALPN-length' into release-3.21Brad King2021-06-291-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3faa3d3a38 curl: backport upstream fix to 7.77.0 regression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6280
| * | | | | | curl: backport upstream fix to 7.77.0 regressionBrad King2021-06-281-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport upstream curl commit `ee97f1769` (schannel: set ALPN length correctly for HTTP/2, 2021-05-26) to get a fix to curl issue 7138, a regression in 7.77.0. Fixes: #22355
* | | | | | Merge topic 'genex-versionadded' into release-3.21Brad King2021-06-281-5/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7993aa3075 Help: Add versionadded tags to cmake-generator-expressions(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6270
| * | | | | | Help: Add versionadded tags to cmake-generator-expressions(7)FeRD (Frank Dana)2021-06-281-5/+105
| |/ / / / /
* | | | | | Merge topic 'Help-CMP0102-mention-warning-variable' into release-3.21Brad King2021-06-281-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 894645d4a6 Help/CMP0102: mention the varible that controls CMP0102 warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6275
| * | | | | | Help/CMP0102: mention the varible that controls CMP0102 warningsBen Boeckel2021-06-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed in the review of !4150, but was noticed during discussion of #22353.
* | | | | | | Merge topic 'doc-3.21-relnotes-supportedPlatforms' into release-3.21Brad King2021-06-281-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ea0aeae4 Help: Clarify 3.21 release note on supportedPlatforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6277
generated by cgit v0.12 at 2025-09-11 20:55:18 (GMT)