mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,495 Commits 2 Branches 385 Tags
d9f8e39357b8d7244172223f76862eea88fbc374
Commit Graph

54495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
d9f8e39357 jsoncpp: Update script to get jsoncpp 1.9.4 2021-09-09 16:00:02 -04:00
Brad King
ed9abd9977 Merge topic 'mocmacrosonce' 
8ff0c2b1dd AutoMoc: Do not list moc macros multiple times
6e2f4029c0 cmAlgorithms: Preserve const-ness in cmRemoveDuplicates range signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6459
 2021-09-09 14:02:52 -04:00
Brad King
111f818b54 Merge topic 'refactor-string-backtrace-vectors' 
ab94c369c9 Refactor: Convert parallel string/backtrace vectors to BT vectors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6486
 2021-09-09 13:23:56 -04:00
Brad King
c2686875fb Merge branch 'release-3.21' 2021-09-09 13:19:54 -04:00
Brad King
37fce84e5b Merge topic 'update-kwsys' 
5cb8516bec Merge branch 'backport-kwsys' into update-kwsys
8e16c9ed1c Merge branch 'upstream-KWSys' into update-kwsys
00ccc0f47c KWSys 2021-09-03 (0da908d4)
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6500
 2021-09-09 13:19:53 -04:00
Brad King
d2a5fef985 Merge topic 'update-kwsys' into release-3.21 
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6500
 2021-09-09 13:19:53 -04:00
Brad King
759171830b Merge branch 'release-3.21' 2021-09-09 13:17:32 -04:00
Brad King
6ed656680d Merge topic 'ci-msvc-19.29-16.11' 
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
 2021-09-09 13:17:32 -04:00
Brad King
0e097776fa Merge topic 'ci-msvc-19.29-16.11' into release-3.21 
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
 2021-09-09 13:17:31 -04:00
Kitware Robot
ce6820fe21 CMake Nightly Date Stamp 2021-09-09 00:01:11 -04:00
Kitware Robot
cf5ed70991 CMake Nightly Date Stamp 2021-09-08 00:01:19 -04:00
Craig Scott
ddea20b3dc Merge topic 'mention-qt6-in-AUTOGEN-help' 
84aaebf79f Help: Mention that Qt6 is supported by AUTOGEN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6508
 2021-09-07 08:26:14 -04:00
Marc Chevrier
ca85bc8067 Merge branch 'release-3.21' 2021-09-07 05:18:55 -04:00
Marc Chevrier
88ea6cb292 Merge topic 'FindPyhton-homebew-on-Mac-M1' 
2636ad5045 FindPython: Ensure homebrew on Mac M1 is used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6499
 2021-09-07 05:18:55 -04:00
Marc Chevrier
45e4ba11cd Merge topic 'FindPyhton-homebew-on-Mac-M1' into release-3.21 
2636ad5045 FindPython: Ensure homebrew on Mac M1 is used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6499
 2021-09-07 05:18:54 -04:00
Kitware Robot
51e7a78b0b CMake Nightly Date Stamp 2021-09-07 00:01:13 -04:00
Joerg Bornemann
84aaebf79f Help: Mention that Qt6 is supported by AUTOGEN 
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2021-09-07 08:51:26 +10:00
Kitware Robot
86ee38d756 CMake Nightly Date Stamp 2021-09-06 00:01:25 -04:00
Kitware Robot
9ab2e0e6f7 CMake Nightly Date Stamp 2021-09-05 00:01:09 -04:00
Kitware Robot
6d5452f1bc CMake Nightly Date Stamp 2021-09-04 00:01:13 -04:00
Brad King
256785749e Merge topic 'doc-implicit-lib-vars' 
441691bc24 Help: Document that toolchain files may set implicit link information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6498
 2021-09-03 10:24:35 -04:00
Brad King
d219220b5e Merge branch 'release-3.21' 2021-09-03 10:18:50 -04:00
Brad King
6059996467 Merge topic 'vs2022' 
38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables
f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6497
 2021-09-03 10:18:50 -04:00
Brad King
31a5b256b9 Merge topic 'vs2022' into release-3.21 
38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables
f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6497
 2021-09-03 10:18:49 -04:00
Brad King
59cd70827a Merge branch 'release-3.21' 2021-09-03 10:17:35 -04:00
Brad King
a2c3ef9379 Merge topic 'FindBoost-1.77' 
1ad0c5ae53 FindBoost: Add support for Boost 1.77

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6494
 2021-09-03 10:17:35 -04:00
Brad King
db053dfd23 Merge topic 'FindBoost-1.77' into release-3.21 
1ad0c5ae53 FindBoost: Add support for Boost 1.77

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6494
 2021-09-03 10:17:34 -04:00
Brad King
6d3eb7bbba Merge branch 'release-3.21' 2021-09-03 10:16:26 -04:00
Brad King
eec847cca5 Merge topic 'ninja-armclang-windows' 
b6cf93472f Ninja: fix ARMClang paths for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6484
 2021-09-03 10:16:26 -04:00
Brad King
351b5ddbf3 Merge topic 'ninja-armclang-windows' into release-3.21 
b6cf93472f Ninja: fix ARMClang paths for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6484
 2021-09-03 10:16:25 -04:00
Brad King
5cb8516bec Merge branch 'backport-kwsys' into update-kwsys 2021-09-03 10:05:54 -04:00
Brad King
8e16c9ed1c Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-09-03 (0da908d4)
 2021-09-03 10:05:47 -04:00
KWSys Upstream
00ccc0f47c KWSys 2021-09-03 (0da908d4) 
Code extracted from:

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

at commit 0da908d419f80a32c361d28d7ce364b8a80ae2c2 (master).

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

Ben Boeckel (2):
      40bbf3fd Status: offer an `IsSuccess` method
      a6a0bb15 Status: use the new IsSuccess method

Brad King (1):
      5d4c8b04 SystemInformation: Simplify demangle buffer management

ulatekh (1):
      4ef5b106 SystemTools: Ensure Windows Vista APIs are available before using them
 2021-09-03 10:05:47 -04:00
ulatekh
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them 
Backport KWSys commit `4ef5b1063` (SystemTools: Ensure Windows Vista
APIs are available before using them, 2021-08-30) to the CMake 3.21
release branch.
 2021-09-03 10:04:38 -04:00
Kyle Edwards
ab94c369c9 Refactor: Convert parallel string/backtrace vectors to BT vectors 2021-09-03 09:52:14 -04:00
David Redondo
8ff0c2b1dd AutoMoc: Do not list moc macros multiple times 
When working on a project with a nested dependency tree, a macro
can be added multiple times. For example in a project I am working
on, in the warning "includes the moc file [... ] but does not contain
a [...] macro" the macro list contains 127 entries but only 25 unique
ones.
 2021-09-03 09:41:12 -04:00
Brad King
6e2f4029c0 cmAlgorithms: Preserve const-ness in cmRemoveDuplicates range signature 
The pattern `vec.erase(cmRemoveDuplicates(vec), vec.end())` fails to
compile with GCC 4.8's libstdc++ if `cmRemoveDuplicates` returns a
`const_iterator` because `end()` returns an `iterator`.  Overload
`cmRemoveDuplicates` to return an iterator type matching the const-ness
of its argument.
 2021-09-03 09:40:57 -04:00
Marc Chevrier
2636ad5045 FindPython: Ensure homebrew on Mac M1 is used 
Fixes: #22581
 2021-09-03 14:59:52 +02:00
Kitware Robot
a89ae726f4 CMake Nightly Date Stamp 2021-09-03 00:01:17 -04:00
Brad King
441691bc24 Help: Document that toolchain files may set implicit link information 
Document in `CMAKE_<LANG>_IMPLICIT_LINK_{LIBRARIES,DIRECTORIES}` how
their value is used and that a fallback value may be provided by a
toolchain file.
 2021-09-02 14:49:40 -04:00
Brad King
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset 2021-09-02 14:24:25 -04:00
Brad King
38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables 
Fixes: #22586
 2021-09-02 13:47:46 -04:00
Brad King
f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset 
This was forgotten in commit 0c7f918fb1 (VS: Update Visual Studio 17
2022 generator for Preview 2, 2021-07-14, v3.21.1~29^2) when the toolset
was first renumbered to `v143`.

Fixes: #22585
 2021-09-02 13:47:42 -04:00
Brad King
1ad0c5ae53 FindBoost: Add support for Boost 1.77 
Update the list of known versions.

Run the command

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

to extract dependencies from the 1.77.0 source tree.  The dependencies
differ from those of 1.76: the `contract`, `thread`, and `wave`
components no longer depend on `date_time`.  The `math` component no
longer depends on `atomic`.

Fixes: #22588
 2021-09-02 12:43:43 -04:00
Martin Kojtal
b6cf93472f Ninja: fix ARMClang paths for Windows 
We need to escape paths for ARMClang on Windows, see the referenced
issue for more details.

Fixes: #21093
 2021-09-02 11:40:17 -04:00
Brad King
c8991f17cf Merge topic 'cmake-packages-pkg-cfg-file-example' 
d186797cf6 Help: Fix regex in example of cmake-packages(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6489
 2021-09-02 10:26:21 -04:00
Brad King
bd7003b858 Merge topic 'test-install-symlinks' 
047d46ebdb Fix: InstallMode tests fail on some platforms
f64e8036aa Tests: Fix check to add InstallMode tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6473
 2021-09-02 10:23:35 -04:00
Brad King
04a05e75ea Merge topic 'update-libarchive' 
6287b02147 libarchive: Limit xz compression level to 6 on AIX
651ecdddfa Utilities: Add hard-coded try_compile result for libarchive strnlen check
107df8e650 Merge branch 'upstream-LibArchive' into update-libarchive
dadea0e5ce LibArchive 2020-12-26 (227a4b97)
3d05964b02 libarchive: Update script to get 3.5.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6464
 2021-09-02 10:22:44 -04:00
Marc Chevrier
80e0245e0e Merge topic 'enh-SetProperty-accepts-new-types' 
dc3aa4024e Refactor: Use new SetProperty signatures
6dfa581bab Enhancement: SetProperty accept cmProp or std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6478
 2021-09-02 03:42:31 -04:00
Kitware Robot
3078bf2063 CMake Nightly Date Stamp 2021-09-02 00:01:09 -04:00