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

32433 Commits

Author SHA1 Message Date
Kitware Robot
4cfc5478b6 CMake Nightly Date Stamp 2022-06-09 00:01:08 -04:00
Brad King
2121fc2de7 Begin post-3.24 development 2022-06-08 12:03:15 -04:00
Brad King
b33b6014b2 Begin 3.24 release versioning 2022-06-08 11:59:27 -04:00
Kitware Robot
252093c216 CMake Nightly Date Stamp 2022-06-08 00:01:17 -04:00
Kitware Robot
3d5402d1df CMake Nightly Date Stamp 2022-06-07 00:01:06 -04:00
Brad King
ab1edff492 Merge topic 'if-command-PATH_EQUAL' 
be4b9e10af if command: Add PATH_EQUAL operator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7321
 2022-06-06 09:47:45 -04:00
Kitware Robot
817d88571a CMake Nightly Date Stamp 2022-06-06 00:02:17 -04:00
Kitware Robot
2a56c24039 CMake Nightly Date Stamp 2022-06-05 00:01:12 -04:00
Brad King
007181a165 Merge topic 'update-kwsys' 
1869f82823 Merge branch 'upstream-KWSys' into update-kwsys
6b88084658 KWSys 2022-06-03 (c28e27bc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7322
 2022-06-04 08:14:09 -04:00
Kitware Robot
cc2c5d4eb5 CMake Nightly Date Stamp 2022-06-04 00:01:09 -04:00
Marc Chevrier
be4b9e10af if command: Add PATH_EQUAL operator 2022-06-03 19:31:36 +02:00
Brad King
bf58164cac Merge topic 'genex-PATH_EQUAL' 
4d1883df11 Genex-PATH_EQUAL: path comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7309
 2022-06-03 09:44:58 -04:00
Brad King
1869f82823 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-06-03 (c28e27bc)
 2022-06-03 06:47:55 -04:00
Kitware Robot
c57688d9c1 CMake Nightly Date Stamp 2022-06-03 00:01:14 -04:00
Brad King
6f72a41de0 Merge topic 'automoc-silence-ranlib-warning' 
4a9daae483 automoc: silence linker warning on macos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7296
 2022-06-02 09:23:10 -04:00
Kitware Robot
4c9aa6c425 CMake Nightly Date Stamp 2022-06-02 00:01:08 -04:00
Brad King
199db6117b Merge topic 'ninja-dedup-def' 
6cc417586e Ninja: Avoid duplicating /DEF: linker flag with MSVC tools
39dba8a244 cmLocalGenerator: Adopt AppendModuleDefinitionFlag method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7307
 2022-06-01 09:35:57 -04:00
Marc Chevrier
4d1883df11 Genex-PATH_EQUAL: path comparison 
To complete issue #23498
 2022-06-01 15:28:54 +02:00
Craig Scott
f3be15e438 Merge topic 'genex-PATH' 
f11e66670b Genex-PATH: path handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7292
 2022-06-01 08:28:07 -04:00
Tim Blechmann
4a9daae483 automoc: silence linker warning on macos 
when an empty `mocs_compilation.cpp` is included in a static library,
the macos linker emits a warning:
```
/Applications/Xcode13.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib:
file: path/To/Library.a(mocs_compilation.cpp.o) has no symbols
```

we therefore generate a globally visible weak symbol in the form of a
virtual function table
 2022-06-01 12:12:08 +08:00
Kitware Robot
dc061c47b5 CMake Nightly Date Stamp 2022-06-01 00:01:11 -04:00
Brad King
6cc417586e Ninja: Avoid duplicating /DEF: linker flag with MSVC tools 
In commit 9a0d5a828a (Ninja: add /DEF: flag to linker call, 2012-03-10,
v2.8.8~22^2~7) the logic should have been added to `GetTargetFlags` in
place of the older logic in that method from commit 7cef36c628 (ENH: add
the ability to generate custom commands for a language that is not
supported by an IDE, 2004-10-21, v2.4.0~2655).

Fixes: #23570
 2022-05-31 15:40:58 -04:00
Brad King
39dba8a244 cmLocalGenerator: Adopt AppendModuleDefinitionFlag method 
Migrate from `cmCommonTargetGenerator::AddModuleDefinitionFlag`.
 2022-05-31 15:40:35 -04:00
Brad King
9d89c9af46 Merge topic 'cmake-gui-locale' 
ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7303
 2022-05-31 11:55:10 -04:00
Marc Chevrier
f11e66670b Genex-PATH: path handling 
Fixes: #23498
 2022-05-31 15:39:51 +02:00
Kitware Robot
fa21bd9527 CMake Nightly Date Stamp 2022-05-31 00:01:08 -04:00
Kitware Robot
45093acd1f CMake Nightly Date Stamp 2022-05-30 00:01:11 -04:00
Kitware Robot
9f4aec6d61 CMake Nightly Date Stamp 2022-05-29 00:01:13 -04:00
Kitware Robot
04ff557917 CMake Nightly Date Stamp 2022-05-28 00:01:16 -04:00
Brad King
ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows 
Restore the logic removed by commit 035078d847 (cmake-gui: Remove
explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with
Qt5 on Windows.  Leave a FIXME comment to support Qt6 later.

Fixes: #23562
Issue: #23565
 2022-05-27 11:52:51 -04:00
Brad King
49e31d9c55 Merge topic 'msvc-compilers-default-to-ZI' 
5fcadc481e MSVC: Default to -ZI instead of /Zi for x86 and x64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7295
 2022-05-27 09:10:43 -04:00
Brad King
6a2ee6f977 Merge topic 'mingw-compiler-PATH' 
55ba10dcfd MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler
9019537670 MSYS/MinGW Makfiles: Select the compiler occurring first in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com>
Merge-request: !7301
 2022-05-27 09:09:23 -04:00
Kitware Robot
8ab866c641 CMake Nightly Date Stamp 2022-05-27 00:01:09 -04:00
Brad King
55ba10dcfd MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler 
Since commit 957c2aac7f (RC: Simplify selection of resource compiler
based on C/C++ toolchain, 2015-05-07, v3.3.0-rc1~101^2~3), `windres` is
selected automatically when using compilers that target the GNU ABI.
Drop the generator-specific preference to make behavior more consistent
with the Ninja generator.

Issue: #23542
 2022-05-26 13:26:54 -04:00
Brad King
9019537670 MSYS/MinGW Makfiles: Select the compiler occurring first in PATH 
Extend the change from commit e01990999a (Ninja: On Windows, select the
compiler occurring first in PATH, 2020-04-17, v3.18.0-rc1~291^2) to
apply to the MSYS/MinGW Makefiles generators too.  Drop the implied
`gcc` and `g++` default compilers.  This allows MinGW/Clang environments
to work out of the box.

Inspired-by: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Fixes: #23542
 2022-05-26 13:22:58 -04:00
Brad King
d45b4f59a4 Merge topic 'verify-interface-header-sets-list' 
aadaac7f6d VERIFY_INTERFACE_HEADER_SETS: Add property for list of header sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7298
 2022-05-26 09:12:21 -04:00
Brad King
799a01996b Merge topic 'automoc-build-dir' 
76608c60d3 AutoMoc: Take AUTOMOC_BUILD_DIR into account in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7291
 2022-05-26 09:11:07 -04:00
Glen Chung
5fcadc481e MSVC: Default to -ZI instead of /Zi for x86 and x64 
Add a policy for compatibility.

For more information, see [1].

[1] https://docs.microsoft.com/en-us/cpp/build/reference/z7-zi-zi-debug-information-format?view=msvc-170

Fixes: #10189
 2022-05-26 09:06:01 -04:00
Kitware Robot
35d975fe4a CMake Nightly Date Stamp 2022-05-26 00:01:07 -04:00
Kyle Edwards
aadaac7f6d VERIFY_INTERFACE_HEADER_SETS: Add property for list of header sets 
Add a new property, INTERFACE_HEADER_SETS_TO_VERIFY, which contains
a list of header sets that should be verified by
VERIFY_INTERFACE_HEADER_SETS.

Fixes: #23522
 2022-05-25 14:37:27 -04:00
Brad King
5dcf505f63 Merge topic 'dependency-providers' 
2aa83fa15b Dependency providers: Add find_package and FetchContent support
8a28368feb FetchContent: Don't discard non-empty SOURCE_DIR and BINARY_DIR
8ce9bb8a0c FetchContent: Don't leak internal variables
74a6ddc339 cmFindPackageCommand: Handle Makefile variable definitions more robustly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com>
Merge-request: !7276
 2022-05-25 07:24:48 -04:00
Joerg Bornemann
76608c60d3 AutoMoc: Take AUTOMOC_BUILD_DIR into account in depfile 
For the Ninja generator and targets that have AUTOMOC_BUILD_DIR set, the
AutoMoc target was always out of date.

That was because the depfile in the AutoMoc build directory was
referencing the wrong timestamp file:
    target_autogen/timestamp: ...dependencies...
instead of
    automoc_build_dir/timestamp: ...dependencies...

Use the relative path of the timestamp file as rule name for the
depfile.  That path is calculated with AUTOMOC_BUILD_DIR taken into
account.

Fixes: #23547
 2022-05-25 13:04:01 +02:00
Kitware Robot
5aa6b9db76 CMake Nightly Date Stamp 2022-05-25 00:01:15 -04:00
Craig Scott
2aa83fa15b Dependency providers: Add find_package and FetchContent support 
Fixes: #22619
 2022-05-25 08:46:18 +10:00
Brad King
7c3169417d Merge topic 'curl-debug-callback' 
e243b379ca cmFileCommand: Fix signature of CURLOPT_DEBUGFUNCTION callback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7288
 2022-05-24 10:09:35 -04:00
Brad King
5ceed2bb28 Merge topic 'reduce-policy-eval-scope' 
cb19a63499 cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7287
 2022-05-24 10:08:52 -04:00
Brad King
9eb81b2f9a Merge topic 'ci-fedora-36' 
ef6a7921e5 gitlab-ci: use Fedora 36 images and environments
483ff3b903 ci: update Linux image to Fedora 36
13c5153ccd ci: make rvm version comments consistent
6c08dd972c clang-tidy: suppress `google-readability-casting` lint
17b7bbf2a0 clang-tidy: suppress new `readability-identifier-length` lint
16e6e4e7dd cmFileCommand: remove an unnecessary cast
b89c085237 clang-tidy: fix `readability-static-definition-in-anonymous-namespace` lints
c8c9d7de03 clang-tidy: fix `bugprone-exception-escape` lints
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7271
 2022-05-24 10:05:33 -04:00
Ben Boeckel
16e6e4e7dd cmFileCommand: remove an unnecessary cast 
`cmCryptoHash::New` already returns a `unique_ptr`.
 2022-05-24 09:09:44 -04:00
Ben Boeckel
b89c085237 clang-tidy: fix readability-static-definition-in-anonymous-namespace lints 2022-05-24 09:09:44 -04:00
Ben Boeckel
c8c9d7de03 clang-tidy: fix bugprone-exception-escape lints 2022-05-24 09:09:44 -04:00