summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'tll-out-of-dir'Brad 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 branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \
| * \ 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
* | | Merge topic 'compiler-id-msvc-has-include'Brad 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.
* | CMake Nightly Date StampKitware Robot2021-06-301-1/+1
| |
* | Merge topic 'test-CTestTestSerialInDepends-lockfile'Brad King2021-06-291-0/+3
|\ \ | | | | | | | | | | | | | | | | | | a5011a2fbf Tests: Cleanup CTestTestSerialInDepends lockfile at test start Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6273
| * | Tests: Cleanup CTestTestSerialInDepends lockfile at test startAlex Sweet2021-06-281-0/+3
| | | | | | | | | | | | | | | | | | | | | When any test under CTestTestSerialInDepends starts, delete the lockfile for that test in case it wasn't deleted at the end of the last test run. Fixes: #22351
* | | Merge branch 'release-3.21'Brad King2021-06-290-0/+0
|\ \ \ | | |/ | |/|
| * | 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 topic 'update-kwsys'Brad 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 branch 'release-3.21'Brad King2021-06-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'tests-tolerate-NINJA_STATUS'Brad 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 branch 'release-3.21'Brad King2021-06-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'test-driver-local-var'Brad 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 branch 'release-3.21'Brad King2021-06-290-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'curl-schannel-ALPN-length'Brad 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
* | | | | | | CMake Nightly Date StampKitware Robot2021-06-291-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.21'Brad King2021-06-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'genex-versionadded'Brad 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 branch 'release-3.21'Brad King2021-06-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'Help-CMP0102-mention-warning-variable'Brad 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 branch 'release-3.21'Brad King2021-06-280-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | Merge topic 'doc-3.21-relnotes-supportedPlatforms'Brad King2021-06-281-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ea0aeae4 Help: Clarify 3.21 release note on supportedPlatforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6277
| * | | | | | | Help: Clarify 3.21 release note on supportedPlatformsBrad King2021-06-281-3/+3
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid implying that the field is always present. Fixes: #22352
* | | | | | | Merge branch 'release-3.21'Brad King2021-06-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ci-base-images' into release-3.21Brad King2021-06-286-5/+8
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53cb34cb23 ci: add freeglut to Debian and Fedora base images b07253f754 ci: update keyserver URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6279
* | | | | | | Merge topic 'ci-base-images'Brad King2021-06-286-5/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53cb34cb23 ci: add freeglut to Debian and Fedora base images b07253f754 ci: update keyserver URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6279
| * | | | | | ci: add freeglut to Debian and Fedora base imagesBrad King2021-06-284-3/+6
| | | | | | |
| * | | | | | ci: update keyserver URLBrad King2021-06-282-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The `sks-keyservers.net` keyserver pool is no longer provided. Switch to `keyserver.ubuntu.com` instead.
* | | | | | Merge branch 'release-3.21'Brad King2021-06-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge topic 'p1689r4-updates' into release-3.21Brad King2021-06-281-8/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cf22263531 Help/dev/experimental: Link to published P1689R4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6278
* | | | | | Merge topic 'p1689r4-updates'Brad King2021-06-281-8/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cf22263531 Help/dev/experimental: Link to published P1689R4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6278
| * | | | | Help/dev/experimental: Link to published P1689R4Brad King2021-06-281-8/+2
| |/ / / /
* | | | | Merge topic 'target_compile_features-only-apply-to-enabled-languages'Brad King2021-06-288-60/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3cafa4237 compile_features: Ignore features that map to languages that aren't enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6255
| * | | | | compile_features: Ignore features that map to languages that aren't enabledRobert Maynard2021-06-258-60/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Cuda/ConsumeCompileFeatures test as it only existed to validate that using `cxx_std_XY` would cause the paired language (CUDA) to also build in mode XY.