Commit Graph

62274 Commits

Author SHA1 Message Date
Brad King 826825fe34 Merge topic 'orkun_24848_19_05_2023'
2bb3d9b644 Autogen: Fix multi-config generated file issue
3bd605f3d0 Autogen: Optimize cmake_autogen execution for CROSS_CONFIG usage
f2f21c5752 Improve Const Correctness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8507
2023-05-31 09:34:23 -04:00
Brad King 5b063510f9 Merge topic 'cmake-verbose-print-build-tool-command'
8451a3f0b5 cmGlobalGenerator: use a stream for output in `Build`
e060666531 cmake: write the build command itself with `--verbose`
b017c9f127 cmGlobalGenerator: fix off-by-one for `&&` command joining
c715fd8d76 cmGlobalGenerator: quote commands in `::Build` output
d6c0e827bc cmGlobalGenerator: add a `QuotedPrintable` method for commands
28ee3bef34 cmGlobalGenerator: add missing spaces in output
465ab8d872 cmGlobalGenerator: use `cmStrCat` in `::Build`
81d45dabc4 cmOutputConverter: add a `static` version of `EscapeForShell`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8183
2023-05-31 09:33:26 -04:00
huangqinjin 5cbbe55de8 FindBoost: Add support for Boost 1.82
Update the list of known versions.

There is a new header-only library, Boost.MySQL. It has no
dependencies and has a core header `<boost/mysql.hpp>`.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_82_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.82.0 source tree.
They are the same as 1.81's dependencies, so just update
the version check for warning about newer versions.
2023-05-31 09:29:16 -04:00
Brad King 3332fdab9d Merge topic 'help-importing-exporting-lib'
aef057d0e8 Help/guide: fix MathFunctionsTargets.cmake path in importing-exporting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8511
2023-05-31 09:27:05 -04:00
Brad King 99bda1d548 Merge branch 'release-3.26' 2023-05-31 09:25:08 -04:00
Brad King 888c235eca Merge topic 'werror_space_fix'
cec6f98018 CMakeDetermineCompilerABI: Avoid removing the flag after -Werror

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8518
2023-05-31 09:25:08 -04:00
Brad King 492bf5e0ac Merge topic 'werror_space_fix' into release-3.26
cec6f98018 CMakeDetermineCompilerABI: Avoid removing the flag after -Werror

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8518
2023-05-31 09:25:06 -04:00
Brad King 062e547116 Merge topic 'cmake-debugger'
a9a592f96e cmake: Add debugger

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Acked-by: Osyotr <zhenchik35026@gmail.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8338
2023-05-31 09:21:02 -04:00
Kitware Robot aa888de1f5 CMake Nightly Date Stamp 2023-05-31 00:01:11 -04:00
Brad King da27ff1e96 Preserve --compile-no-warning-as-error in automatic CMake re-runs
When the build system re-runs `cmake` to regenerate itself, preserve the
`--compile-no-warning-as-error` option if it was used when `cmake` was
last explicitly invoked.  Normally such settings are preserved in the
cache, but the purpose of this option is to be beyond the reach of
project code.
2023-05-30 17:44:43 -04:00
Brad King e0b48284a1 Xcode: Internally uses -S instead of -H to specify source directory
This was accidentally left out of commit de962cc00d (CMake: Internally
uses -S instead of -H to specify source directory, 2018-09-06,
v3.13.0-rc1~76^2~1).
2023-05-30 17:22:15 -04:00
Raul Tambre cec6f98018 CMakeDetermineCompilerABI: Avoid removing the flag after -Werror
The matching became too eager after commit 079ea66468
(CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags, 2020-10-04,
v3.19.0-rc1~45^2). When -Werror was specified without a value we would
eat the following flag. Prevent this by disallowing "-" as the first
character of the flag's value.

Fixes: 079ea66468
See-also: https://discourse.cmake.org/t/8230
2023-05-30 11:03:09 -04:00
Brad King b50caaf96a Merge topic 'backport-sphinx-file-encoding' into release-3.26
e4f26edc1c Tests: Always load presets schema as UTF-8
fc2b60ca6b Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhp
853f069103 Sphinx: Specify encoding when opening files for title extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8521
2023-05-30 10:59:10 -04:00
Brad King 305527f5c6 Merge branch 'release-3.26' into master 2023-05-30 10:59:10 -04:00
Marc Chevrier 4fc322bab4 AddCacheEntry: Suppress raw pointer usage 2023-05-30 16:41:59 +02:00
Craig Scott e4f26edc1c Tests: Always load presets schema as UTF-8
We know the encoding of the schema file, so we should specify it
when we open it for reading. Previously, by not specifying it, the test
was open to using an encoding based on the active locale when
running the test. We may have been enforcing a "C" locale at a higher
level, but we don't need to rely on that here, we can force correct
behavior without that assumption.

Issue: #24679
2023-05-30 10:32:59 -04:00
Craig Scott fc2b60ca6b Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhp 2023-05-30 10:32:59 -04:00
Craig Scott 853f069103 Sphinx: Specify encoding when opening files for title extraction
When the encoding is not specified, open() may choose an encoding
based on the locale in use. That encoding may have no relationship
to the encoding of the file being opened. Use the locale from the
document settings instead, which should better match the file's
encoding.

Fixes: #24679
2023-05-30 10:32:59 -04:00
Glen Chung a9a592f96e cmake: Add debugger
- Depends on cppdap and jsoncpp.
- Add --debugger argument to enable the Debugger.
- Add --debugger-pipe argument for DAP traffics over named pipes.
- Support breakpoints by filenames and line numbers.
- Support exception breakpoints.
- Call stack shows filenames and line numbers.
- Show Cache Variables.
- Show the state of currently defined targets,
  tests and directories with their properties.
- Add cmakeVersion to DAP initialize response.
- Include unit tests.

Co-authored-by: Ben McMorran <bemcmorr@microsoft.com>
2023-05-30 09:46:12 -04:00
Brad King b0d1ddb723 Merge topic 'import-cppdap'
4a84f71049 ci: Provide cppdap in extdeps jobs
5ec69eb58c cppdap: Build as part of CMake or use external installation
3381e6bd5c Merge branch 'upstream-cppdap' into import-cppdap
1daeefc378 cppdap 2023-05-26 (03cc1867)
bd58bc7817 cppdap: Add script to import version as of 2023-05-25
172045b53b jsoncpp: Add cm3p/ headers for json/json.h and json/forwards.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8342
2023-05-30 09:44:38 -04:00
Brad King 0283b2d2bd Merge topic 'cmuvprocesschain-merged-output'
ec80090ce3 cmUVProcessChain: Add option for merged output and error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8513
2023-05-30 09:42:32 -04:00
Brad King 150f0f19bc Merge topic 'cmuvprocesschain-working-directory'
67bb1ee50c cmUVProcessChain: Add working directory option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8512
2023-05-30 09:41:35 -04:00
Brad King 2de38e0b45 Utilities: Update hard-coded try_compile results for curl 8.1.2 2023-05-30 09:40:38 -04:00
Brad King a6c9b53273 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-05-30 (7ab9d437)
2023-05-30 09:39:43 -04:00
Curl Upstream 80cb6a5121 curl 2023-05-30 (7ab9d437)
Code extracted from:

    https://github.com/curl/curl.git

at commit 7ab9d43720bc34d9aa351c7ca683c1668ebf8335 (curl-8_1_2).
2023-05-30 09:37:14 -04:00
Brad King 7f1abf62e1 curl: Update script to get curl 8.1.2 2023-05-30 09:36:39 -04:00
Brad King f0e0eb6385 Merge topic 'SetProperty-suppress-raw-pointer-usage'
aa5fed5052 SetProperty: suppress raw pointer usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8509
2023-05-30 09:35:58 -04:00
Kitware Robot 2acfaa084a CMake Nightly Date Stamp 2023-05-30 00:01:08 -04:00
Marc Chevrier 7f5ead092b Merge topic 'enhance-linker-depfile-configuration'
0626b62cf2 Link Step: ensure the correct linker is used for depfile configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8515
2023-05-29 04:19:07 -04:00
Kitware Robot a2f1614a26 CMake Nightly Date Stamp 2023-05-29 00:01:38 -04:00
Craig Scott 8fdce89f70 Help: Clarify default TLS_VERIFY behavior for git download method 2023-05-28 20:16:19 +10:00
Marc Chevrier 0626b62cf2 Link Step: ensure the correct linker is used for depfile configuration
This is related to MR !8443.
2023-05-28 11:28:08 +02:00
Kitware Robot 1f98b65e3e CMake Nightly Date Stamp 2023-05-28 00:01:09 -04:00
Ben Boeckel 8451a3f0b5 cmGlobalGenerator: use a stream for output in Build
This allows output to show up in output immediately instead of being
batched.
2023-05-27 07:04:17 -04:00
Orkun Tokdemir 2bb3d9b644 Autogen: Fix multi-config generated file issue
The default config was an empty string when a `multi-config`
generator is used. An if check was added for those situations.
If a source file has a specific config configuration,
it is used with `$<CONFIG>` in the `multi-config` generator usage.

Fixes: #24848
2023-05-27 12:55:21 +02:00
Kitware Robot 5d39aad169 CMake Nightly Date Stamp 2023-05-27 00:01:13 -04:00
Kyle Edwards ec80090ce3 cmUVProcessChain: Add option for merged output and error 2023-05-26 15:52:01 -04:00
Olivier Blin aef057d0e8 Help/guide: fix MathFunctionsTargets.cmake path in importing-exporting
It is using ${CMAKE_INSTALL_LIBDIR} and an extra "/MathFunctions" path
suffix since these commits:
- e58a76de51 Help/guide: fix importing-exporting CMake install destinations
- 26cf661b64 Help/guide: use GNUInstallDirs in importing-exporting example
2023-05-26 17:40:19 +02:00
Kyle Edwards 67bb1ee50c cmUVProcessChain: Add working directory option 2023-05-26 11:25:32 -04:00
Orkun Tokdemir 3bd605f3d0 Autogen: Optimize cmake_autogen execution for CROSS_CONFIG usage
The redundant `cmake_autogen` process execution was optimized for
non-`CROSS_CONFIGS` usage. It was executed three times for each
config although only one of them is needed.
2023-05-26 16:11:12 +02:00
Brad King 4a84f71049 ci: Provide cppdap in extdeps jobs
Debian 10 and Fedora 37 do not yet package cppdap, so our
base images do not include it.  Build it in extdeps jobs.
2023-05-26 09:36:42 -04:00
Brad King 5ec69eb58c cppdap: Build as part of CMake or use external installation
Add `cm3p/` headers to use the selected copy of the library.

Co-authored-by: Glen Chung <kuchung@microsoft.com>
2023-05-26 09:36:14 -04:00
Glen Chung 3381e6bd5c Merge branch 'upstream-cppdap' into import-cppdap
* upstream-cppdap:
  cppdap 2023-05-26 (03cc1867)
2023-05-26 09:36:03 -04:00
cppdap Upstream 1daeefc378 cppdap 2023-05-26 (03cc1867)
Code extracted from:

    https://github.com/google/cppdap.git

at commit 03cc18678ed2ed8b2424ec99dee7e4655d876db5 (03cc18678ed2ed8b2424ec99dee7e4655d876db5).
2023-05-26 09:33:55 -04:00
Brad King bd58bc7817 cppdap: Add script to import version as of 2023-05-25
Co-authored-by: Glen Chung <kuchung@microsoft.com>
2023-05-26 09:33:34 -04:00
Brad King b8449712a3 Merge topic 'implicit-link-dir-exclude'
023de565d3 Optionally exclude implicit link directories via environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Roscoe A. Bartlett <rabartl@sandia.gov>
Merge-request: !8506
2023-05-26 09:27:23 -04:00
Brad King a3223bfa68 Merge topic 'intelllvm-link-shared-modules'
9875b11969 IntelLLVM: Use compiler driver as linker for MODULE libraries too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8505
2023-05-26 09:24:48 -04:00
Brad King 8ed8c73bd4 Merge topic 'update-kwsys'
4032968220 Merge branch 'upstream-KWSys' into update-kwsys
5df527f7af KWSys 2023-05-25 (c9f0da47)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8504
2023-05-26 09:22:09 -04:00
Marc Chevrier aa5fed5052 SetProperty: suppress raw pointer usage 2023-05-26 14:48:22 +02:00
Orkun Tokdemir f2f21c5752 Improve Const Correctness 2023-05-26 14:15:24 +02:00