Commit Graph

50403 Commits

Author SHA1 Message Date
Mario Emmenlauer
6d45f951ed FindGTest: Minor whitespace change, moved an include upwards 2020-10-22 09:32:23 -04:00
Mario Emmenlauer
98d5f033ed FindGTest: Ensure target names follow upstream GTest 2020-10-22 09:32:19 -04:00
Brad King
585cc7c930 ci: install gmock in the Fedora 31 image
The gmock libraries are referenced by GTest's CMake package files.

While at it, also explicitly install gettext.  It is installed already,
but make it explicit for future testing of the FindGettext module.
2020-10-22 09:32:18 -04:00
Brad King
ccd313a074 Merge topic 'constify'
bd705788f6 Constify some code as suggested by clang-tidy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5391
2020-10-21 10:19:47 -04:00
Kyle Edwards
9367a7a6d5 Merge branch 'release-3.19' 2020-10-21 09:15:30 -04:00
Kyle Edwards
1a03e1bb01 Merge topic 'cmakepresets-schema'
cf6ac2d365 Merge branch 'master' into cmakepresets-schema
21bc2fd945 CI: Install jsonschema for schema testing
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests
0307f7c980 Help: Add JSON schema for CMakePresets.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5366
2020-10-21 09:15:29 -04:00
Kyle Edwards
ec3b3d2c2f Merge topic 'cmakepresets-schema' into release-3.19
21bc2fd945 CI: Install jsonschema for schema testing
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests
0307f7c980 Help: Add JSON schema for CMakePresets.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5366
2020-10-21 09:15:29 -04:00
Kitware Robot
7398b4783e CMake Nightly Date Stamp 2020-10-21 00:01:17 -04:00
Brad King
e59c8f548d Merge topic 'ci-win-python' into release-3.19
8f7fef629b ci: add Python to PATH on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5403
2020-10-20 15:59:20 -04:00
Brad King
ef9030a94f Merge branch 'release-3.19' 2020-10-20 15:59:20 -04:00
Brad King
9ef8477fe9 Merge topic 'ci-win-python'
8f7fef629b ci: add Python to PATH on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5403
2020-10-20 15:59:20 -04:00
Brad King
8f7fef629b ci: add Python to PATH on Windows
Our test suite searches for a Python interpreter to perform some extra
checks.  Our CI base images for Linux have Python available.  Update our
Windows jobs to provide a Python interpreter for our test suite to find
consistently between the build and test steps.
2020-10-20 15:11:12 -04:00
Kyle Edwards
cf6ac2d365 Merge branch 'master' into cmakepresets-schema 2020-10-20 14:51:42 -04:00
Kyle Edwards
21bc2fd945 CI: Install jsonschema for schema testing 2020-10-20 12:18:10 -04:00
Kyle Edwards
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 2020-10-20 12:07:09 -04:00
Ben McMorran
0307f7c980 Help: Add JSON schema for CMakePresets.json 2020-10-20 12:07:09 -04:00
Kyle Edwards
81c88bb261 Merge topic 'cmake-presets-doc-move' into release-3.19
4a123fc28c Help: Clarify purpose of warnings and errors
6c74bcfc20 Help: Make architecture and toolset descriptions generic
45766789a0 Help: Add inheritance to CMakePresets.json example
88c9d6f6eb Help: Add documentation for debug field
efab856008 Help: Show environment field
2208db114c Help: Show multiple ways of doing cacheVariables
d30f85193f Help: Move vendor field into example
b9c8c57860 Help: s/unusedVars/unusedCli/
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5373
2020-10-20 11:59:54 -04:00
Kyle Edwards
8bb8c9fb13 Merge branch 'release-3.19' 2020-10-20 11:59:54 -04:00
Kyle Edwards
54a5c026d0 Merge topic 'cmake-presets-doc-move'
4a123fc28c Help: Clarify purpose of warnings and errors
6c74bcfc20 Help: Make architecture and toolset descriptions generic
45766789a0 Help: Add inheritance to CMakePresets.json example
88c9d6f6eb Help: Add documentation for debug field
efab856008 Help: Show environment field
2208db114c Help: Show multiple ways of doing cacheVariables
d30f85193f Help: Move vendor field into example
b9c8c57860 Help: s/unusedVars/unusedCli/
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5373
2020-10-20 11:59:54 -04:00
Brad King
30d2d34611 Merge topic 'nsis-utf-8-bom'
c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5392
2020-10-20 09:39:15 -04:00
Brad King
57a29e9d31 Merge branch 'release-3.19' 2020-10-20 09:38:18 -04:00
Brad King
2fb0768dc0 Merge topic 'find_package-check-dir'
0356b81525 find_package: Fix regression in searching root prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5396
2020-10-20 09:38:18 -04:00
Brad King
bb4e2f3f9a Merge topic 'find_package-check-dir' into release-3.19
0356b81525 find_package: Fix regression in searching root prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5396
2020-10-20 09:38:17 -04:00
Kitware Robot
7bac94e38c CMake Nightly Date Stamp 2020-10-20 00:01:15 -04:00
Cengizhan Pasaoglu
bd705788f6 Constify some code as suggested by clang-tidy 2020-10-20 00:04:04 +03:00
Johnny Jazeix
c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode
Fixes: #21318
2020-10-19 19:53:56 +02:00
Brad King
0356b81525 find_package: Fix regression in searching root prefix
Fix the check added by commit 2ff1693066 (find_package: avoid showing
files as directories when searching config files, 2020-09-30,
v3.19.0-rc1~67^2) to avoid skipping the root prefix `/`.

Fixes: #21324
2020-10-19 11:08:49 -04:00
Kyle Edwards
4a123fc28c Help: Clarify purpose of warnings and errors 2020-10-19 10:29:19 -04:00
Kyle Edwards
6c74bcfc20 Help: Make architecture and toolset descriptions generic 2020-10-19 10:29:19 -04:00
Kyle Edwards
45766789a0 Help: Add inheritance to CMakePresets.json example 2020-10-19 10:29:19 -04:00
Brad King
c05e561474 Merge topic 'checklanguage-honor-toolchain'
bddc54a37d CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5384
2020-10-19 10:28:58 -04:00
Brad King
e61d872839 Merge topic 'FindPython-support-version-3.10' into release-3.19
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
2020-10-19 10:28:00 -04:00
Brad King
5f9d41b7e3 Merge branch 'release-3.19' 2020-10-19 10:28:00 -04:00
Brad King
9bda28c7a6 Merge topic 'FindPython-support-version-3.10'
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
2020-10-19 10:28:00 -04:00
Brad King
b271385c67 Merge branch 'release-3.19' 2020-10-19 10:26:31 -04:00
Brad King
bd080f64ba Merge topic 'separate_arguments-no-args'
747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5382
2020-10-19 10:26:31 -04:00
Brad King
f4e6dfe55d Merge topic 'separate_arguments-no-args' into release-3.19
747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5382
2020-10-19 10:26:30 -04:00
Kyle Edwards
88c9d6f6eb Help: Add documentation for debug field
Oops!
2020-10-19 10:25:57 -04:00
Kyle Edwards
efab856008 Help: Show environment field 2020-10-19 10:25:57 -04:00
Kyle Edwards
2208db114c Help: Show multiple ways of doing cacheVariables
This demonstrates both the simple string and the complex object,
and ensures that they get automated testing.
2020-10-19 10:25:57 -04:00
Kyle Edwards
d30f85193f Help: Move vendor field into example
This ensures that the vendor field gets automated testing from the
example.
2020-10-19 10:25:57 -04:00
Kyle Edwards
b9c8c57860 Help: s/unusedVars/unusedCli/
This was a mistake in the documentation.

Fixes: #21303
2020-10-19 10:25:57 -04:00
Kyle Edwards
c436aaaad1 Help: Move CMakePresets.json documentation into a separate file 2020-10-19 10:25:57 -04:00
Brad King
91cc2f1eed Merge branch 'release-3.19' 2020-10-19 10:23:50 -04:00
Brad King
ae1ca3034e Merge topic 'doc-CMP0111' into release-3.19
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !5385
2020-10-19 10:23:50 -04:00
Brad King
860e40de6b Merge topic 'doc-CMP0111'
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !5385
2020-10-19 10:23:50 -04:00
Brad King
fd0aab88d5 Merge branch 'release-3.19' 2020-10-19 10:21:58 -04:00
Brad King
30d872d2d1 Merge topic 'sccache-macos-without-timeouts'
b0fe666846 ci: use a patched sccache on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5394
2020-10-19 10:21:58 -04:00
Brad King
d3d292aa7b Merge topic 'sccache-macos-without-timeouts' into release-3.19
b0fe666846 ci: use a patched sccache on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5394
2020-10-19 10:21:57 -04:00
Ben Boeckel
b0fe666846 ci: use a patched sccache on macOS
This version is much less likely to timeout on server startup since it
runs the expensive computation in a background thread.

See https://github.com/mozilla/sccache/pull/868 for the status.
2020-10-19 09:23:06 -04:00