Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity
53,316 Commits 2 Branches 375 Tags
100d3cb392679f2531ede8e3f3e944b13124cfda
Commit Graph

53316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards
100d3cb392 file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream() 
Fixes: #22278
 2021-06-07 15:35:48 -04:00
Brad King
8732749ef4 Merge topic 'vs-flag-tables' 
887e9df0c7 VS: Update v142 CL flag table for VS 16.10
25e33a282b VS: Update v141 CL flag table for VS 15.9
f9383e0140 VS: Re-order v141 and v142 CL flag table entries to match xml files better

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6191
 2021-06-07 13:26:29 -04:00
Brad King
72ea35b0ee Merge branch 'release-3.20' 2021-06-07 13:22:04 -04:00
Brad King
79e3c6221a Merge topic 'FindBoost-json-header' 
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6193
 2021-06-07 13:22:04 -04:00
Brad King
f092fe677f Merge topic 'FindBoost-json-header' into release-3.20 
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6193
 2021-06-07 13:22:03 -04:00
Brad King
684685b25f Merge topic 'ci-clang' 
7e5e558d0f gitlab-ci: add job to test with clang-7 on debian10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6194
 2021-06-07 13:19:48 -04:00
Kitware Robot
4ee2fc28a6 CMake Nightly Date Stamp 2021-06-07 00:01:16 -04:00
Kitware Robot
42af35136f CMake Nightly Date Stamp 2021-06-06 00:01:06 -04:00
Kitware Robot
48b7360ede CMake Nightly Date Stamp 2021-06-05 00:01:11 -04:00
John Drouhard
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+ 
In commit 8293064760 (FindBoost: Add support for Boost 1.75, 2021-02-03,
v3.19.5~9^2) the dependencies of the json component were added, but the
header listing was left out.
 2021-06-04 13:43:54 -04:00
Brad King
7e5e558d0f gitlab-ci: add job to test with clang-7 on debian10 
Test with a Clang version old enough to have caught the regression fixed
by commit 9411766c35 (BinUtils: Avoid llvm-objdump versions older than
Clang 9, 2021-05-29).
 2021-06-04 13:30:19 -04:00
Brad King
887e9df0c7 VS: Update v142 CL flag table for VS 16.10 
Run the command

    python3 Source/cmConvertMSBuildXMLToJSON.py -t v142 \
        'c:/.../MSBuild/Microsoft/VC/v160/1033/cl.xml'

To generate `v142_CL.json` locally.  Manually move new and updated
settings over to `Templates/MSBuild/FlagTables/v142_CL.json`.

Revise the `/sourceDependencies[:directives]` table entries to properly
distinguish the two options (because one is a prefix of the other), and
to populate both `Generate*Dependencies` and `*DependenciesFile`.
 2021-06-04 10:17:13 -04:00
Brad King
25e33a282b VS: Update v141 CL flag table for VS 15.9 
Run the command

    python3 Source/cmConvertMSBuildXMLToJSON.py -t v141 \
        'c:/.../Common7/IDE/VC/VCTargets/1033/cl.xml'

To generate `v141_CL.json` locally.  Manually move new and updated
settings over to `Templates/MSBuild/FlagTables/v141_CL.json`.
 2021-06-04 10:12:38 -04:00
Brad King
f9383e0140 VS: Re-order v141 and v142 CL flag table entries to match xml files better 2021-06-04 09:39:53 -04:00
Brad King
26e75b474b Merge topic 'env-toolchain-file' 
6c34ed9b87 cmake: Allow CMAKE_TOOLCHAIN_FILE to be set by environment variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6188
 2021-06-04 07:00:43 -04:00
Brad King
c61782917d Merge topic 'implicit-link-static' 
1d7fddca8e CMakeParseImplicitLinkInfo: Honor GNU static runtime library flags
629eb3926b Tests: Extend ParseImplicit*Info with static GNU runtime library flags
9d0f8c3e56 Tests: Teach RunCMake.ParseImplicitLinkInfo to match output by regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6185
 2021-06-04 06:59:37 -04:00
Brad King
ccaaca4e7d Merge topic 'ci-clang-analyzer' 
da14f4e19e gitlab-ci: add job to build with clang-analyzer
adc38da49f ci: add clang-analyzer to Fedora base image
b6c4d93dcd clang-analyzer: Suppress warnings in intentional use-after-move cases
c1b575f4d1 clang-analyzer: rename from scan-build in comments
dbfb50cd72 cmFileAPICodemodel: Assert input in DirectoryObject::DumpInstaller
410bf8ed4f cmStandardLevelResolver: Fix size assertion in constructor
82584b99e3 jsoncpp: Revert "Code style: add missed explicit 'this->'"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6189
 2021-06-04 06:57:51 -04:00
Brad King
c845b7ef37 Merge branch 'release-3.20' 2021-06-04 06:53:47 -04:00
Brad King
e7dd507f3f Merge topic 'ci-sccache-consistent-builds' 
95faf9cb96 Merge branch 'master' into ci-sccache-consistent-builds
9d7ebb47ea ci: use consistent sccache builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6156
 2021-06-04 06:53:47 -04:00
Brad King
451b1a8321 Merge topic 'ci-sccache-consistent-builds' into release-3.20 
9d7ebb47ea ci: use consistent sccache builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6156
 2021-06-04 06:53:46 -04:00
Kitware Robot
186e6aa66f CMake Nightly Date Stamp 2021-06-04 00:01:10 -04:00
Brad King
da14f4e19e gitlab-ci: add job to build with clang-analyzer 
Update the exceptions in `CTestCustom.cmake.in` to match this job's
needs.  Drop exceptions needed only by our previous nightly build.
 2021-06-03 15:06:42 -04:00
Brad King
adc38da49f ci: add clang-analyzer to Fedora base image 2021-06-03 14:59:55 -04:00
Brad King
b6c4d93dcd clang-analyzer: Suppress warnings in intentional use-after-move cases 2021-06-03 14:59:55 -04:00
Brad King
c1b575f4d1 clang-analyzer: rename from scan-build in comments 2021-06-03 14:59:55 -04:00
Brad King
dbfb50cd72 cmFileAPICodemodel: Assert input in DirectoryObject::DumpInstaller 
This tells clang-analyzer that the `gen` argument is never `nullptr`.
 2021-06-03 14:59:55 -04:00
Brad King
410bf8ed4f cmStandardLevelResolver: Fix size assertion in constructor 
Assert sizes of the constructed vectors, not the moved-from inputs.
 2021-06-03 14:59:55 -04:00
Kitware Robot
82584b99e3 jsoncpp: Revert "Code style: add missed explicit 'this->'" 
Revert the part of commit 209daa20b2 (Code style: add missed explicit
'this->', 2021-01-05, v3.20.0-rc1~213^2) that updated third-party code.
 2021-06-03 14:59:42 -04:00
Brad King
6c34ed9b87 cmake: Allow CMAKE_TOOLCHAIN_FILE to be set by environment variable 
When no `CMAKE_TOOLCHAIN_FILE` is explicitly specified while creating
a new build tree, check for an environment variable of the same name.
 2021-06-03 08:32:44 -04:00
Brad King
95faf9cb96 Merge branch 'master' into ci-sccache-consistent-builds 2021-06-03 08:18:32 -04:00
Brad King
1d7fddca8e CMakeParseImplicitLinkInfo: Honor GNU static runtime library flags 
With flags like `-static-libstdc++` or `-static-libgfortran`, the GNU
compiler driver adds `-Bstatic ... -Bdynamic` around its language
runtime library.  Convert the libraries in between these to absolute
paths so that mixed-language linking honors the static runtime
libraries.
 2021-06-03 08:12:58 -04:00
Brad King
629eb3926b Tests: Extend ParseImplicit*Info with static GNU runtime library flags 
Generate sample input data with GNU 10.2.1 compilers using flags like
`-static-libstdc++` and `-static-libgfortran`.
 2021-06-03 08:12:11 -04:00
Brad King
9d0f8c3e56 Tests: Teach RunCMake.ParseImplicitLinkInfo to match output by regex 
As in commit 6bc6fc2a7f (Tests: Teach RunCMake.ParseImplicitIncludeInfo
to match output by regex, 2019-04-08, v3.14.2~5^2~1).
 2021-06-03 08:12:11 -04:00
Brad King
9c33ff4dda Merge topic 'find_item-NO_CACHE' 
87b71eec62 find_*: Add support for option NO_CACHE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6181
 2021-06-03 08:11:04 -04:00
Brad King
e6bcd5e45a Merge topic 'doc_regex' 
0d210b92fa Help: links to CMake regex syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6179
 2021-06-03 08:09:34 -04:00
Brad King
4297357087 Merge topic 'ctest-coverage-no-dir' 
5d5610b04f CTest: Exit coverage handling early if no binary dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6144
 2021-06-03 08:08:42 -04:00
Brad King
dcadb290ad Merge topic 'ninja-multi-config-default-configs-doc' 
dbe3f8eee7 Help: Clarify default value of CMAKE_CONFIGURATION_TYPES for NMC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6184
 2021-06-03 08:07:21 -04:00
Brad King
9f7c6a67e5 Merge topic 'update-kwsys' 
1b6fbdf1d7 Merge branch 'upstream-KWSys' into update-kwsys
fc5b7905ed KWSys 2021-06-02 (ad35b3ba)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6183
 2021-06-03 08:06:32 -04:00
Brad King
bf0d56a1fb Merge topic 'depfile-no-vstlog' 
f0e9d74a2d cmake_transform_depfile: Remove unused incomplete vstlog support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6182
 2021-06-03 08:05:42 -04:00
Kitware Robot
2ff2085fb8 CMake Nightly Date Stamp 2021-06-03 00:01:11 -04:00
Ben Boeckel
9d7ebb47ea ci: use consistent sccache builds 2021-06-02 15:43:16 -04:00
Marc Chevrier
87b71eec62 find_*: Add support for option NO_CACHE 
Request that find result is stored in a normal variable rather than a
cache entry.

Fixes: #20687
Issue: #20743
 2021-06-02 14:55:00 -04:00
Michael Hirsch
0d210b92fa Help: links to CMake regex syntax 2021-06-02 10:30:21 -04:00
Kyle Edwards
dbe3f8eee7 Help: Clarify default value of CMAKE_CONFIGURATION_TYPES for NMC 
Fixes: #22266
 2021-06-02 08:57:43 -04:00
Joseph Snyder
5d5610b04f CTest: Exit coverage handling early if no binary dir 
Check for the existence of the Binary directory string before checking
for coverage files.  If the directory is not specified, write an error
message and do not do any checking.

Fixes: #22102
 2021-06-02 08:41:09 -04:00
Brad King
1b6fbdf1d7 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-06-02 (ad35b3ba)
 2021-06-02 07:46:47 -04:00
KWSys Upstream
fc5b7905ed KWSys 2021-06-02 (ad35b3ba) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit ad35b3bae42fe21b8ea1d35799c8f141c9d5a2ec (master).

Upstream Shortlog
-----------------

Adriaan de Groot (1):
      e65c5693 testSystemTools: apply root-check to more systems
 2021-06-02 07:46:47 -04:00
Brad King
f0e9d74a2d cmake_transform_depfile: Remove unused incomplete vstlog support 
In commit b2c14bc774 (cmake -E: Add cmake_transform_depfile internal
command, 2020-10-02, v3.20.0-rc1~684^2~2) a partial implementation for
converting MSBuild "TLog" format files was added.  However, it is
unused and incomplete:

* Does not enforce absolute paths as TLog docs require.
* Does not upper-case paths as TLog docs recommend.
* The TLog format semantics are not equivalent to `out: in`.

Remove the unused TLog transform infrastructure to avoid confusion.

Issue: #20286
 2021-06-02 07:41:05 -04:00
Brad King
cf470d8dac Merge topic 'command_target' 
1cb4f592a0 add_custom_command: Target-dependent generator expression support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6176
 2021-06-02 07:39:44 -04:00
Brad King
399a321a64 Merge topic 'get-runtime-dependencies-file-filter' 
a12639e658 file(GET_RUNTIME_DEPENDENCIES): Add POST_{IN,EX}CLUDE_FILES arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6170
 2021-06-02 07:38:17 -04:00