mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
61,005 Commits 2 Branches 401 Tags
74e0b5d9f5006f9344856428a27c6cfb47591df0
Commit Graph

61005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Markelov 74e0b5d9f5 VS: Fix wrong appxManifest if OUTPUT_NAME != target name 
Fixes #24416
 2023-02-15 20:35:50 -07:00
Brad King 37f068083b Merge branch 'release-3.26' 2023-02-15 10:04:50 -05:00
Brad King 037975ef69 CMake 3.26.0-rc3 v3.26.0-rc3 2023-02-15 09:34:02 -05:00
Brad King 463071a102 Merge branch 'release-3.26' 2023-02-15 09:01:20 -05:00
Brad King bcf60b6d3d Merge topic 'LLVMFlang-post-preprocessed' into release-3.26 
3f1e58c5b9 LLVMFlang: Fix post-preprocess compile for fixed-form Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrzej Warzyński <andrzej.warzynski@gmail.com>
Merge-request: !8205
 2023-02-15 09:00:10 -05:00
Brad King b297b63f17 Merge topic 'AutoExport-vftable' 
f513781bc5 WINDOWS_EXPORT_ALL_SYMBOLS: Export vftable symbol

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8201
 2023-02-15 08:58:44 -05:00
Brad King e2ed34abf8 Merge topic 'ninja-custom-command-depends' 
082ccd7530 add_custom_command: Add DEPENDS_EXPLICIT_ONLY option for Ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8198
 2023-02-15 08:57:32 -05:00
Brad King a550db0d45 Merge topic 'test-extra-generators' 
6cf281b108 Tests: Add dedicated RunCMake.ExtraGenerators test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8202
 2023-02-15 08:20:29 -05:00
Brad King a1140b61db Merge topic 'LLVMFlang-post-preprocessed' 
3f1e58c5b9 LLVMFlang: Fix post-preprocess compile for fixed-form Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrzej Warzyński <andrzej.warzynski@gmail.com>
Merge-request: !8205
 2023-02-15 08:19:32 -05:00
Brad King 4802ffbead Merge topic 'doc' 
615ba911c4 Help: cmake(1): sleep can have floating point value
68a46505a3 Help: math: note that floating point inputs are invalid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8206
 2023-02-15 08:18:07 -05:00
Brad King efca640726 Merge topic 'nullptr' 
7b0a629693 Source: use C++11 nullptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8207
 2023-02-15 08:17:06 -05:00
Kitware Robot 03c811edfd CMake Nightly Date Stamp 2023-02-15 00:01:12 -05:00
scivision 7b0a629693 Source: use C++11 nullptr 2023-02-14 14:34:03 -05:00
scivision 615ba911c4 Help: cmake(1): sleep can have floating point value 2023-02-14 13:38:59 -05:00
scivision 68a46505a3 Help: math: note that floating point inputs are invalid 2023-02-14 13:33:31 -05:00
David Truby 3f1e58c5b9 LLVMFlang: Fix post-preprocess compile for fixed-form Fortran 
LLVM Flang's preprocessor output is always valid fixed form Fortran with
a fixed line length of 72. If an application tries to use fixed form
with a different line length, this will fail in the
post-preprocessing compilation step as they will pass a flag asking for
a different fixed line length.

To fix this we can pass -ffixed-line-length-72 to the post-preprocess
compilation stage. This will be ignored when the input is free form
Fortran, and force to a 72 line length when the input is fixed.
 2023-02-14 09:22:12 -05:00
Brad King 283432a1aa Merge topic 'ninja-collation-dependencies' 
b6a5382217 Ninja: depend on language module information files directly
0ace6053e8 Ninja: track modmap dependencies properly
b215cbc07d Ninja: remove the modmap as an output of the scanner

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8197
 2023-02-14 09:16:42 -05:00
Brad King 06e62ff5e8 Merge topic 'KateDontIncludeFilesInBuildDir' 
8802b81b0d Kate: don't include files in the CMakeFiles/ dir in the project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8196
 2023-02-14 09:15:59 -05:00
Malcolm Bechard f513781bc5 WINDOWS_EXPORT_ALL_SYMBOLS: Export vftable symbol 
`pybind11` requires access to this symbol to link in some cases.
Include this symbol when generating automatic exports via
`CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS`.

Fixes: #24406
 2023-02-14 09:11:45 -05:00
Abdelmaged Khalifa 082ccd7530 add_custom_command: Add DEPENDS_EXPLICIT_ONLY option for Ninja 
Add option `DEPENDS_EXPLICIT_ONLY` to `add_custom_command` to indicate
that implicit dependencies coming from users of the output are not
needed, and only consider dependencies explicitly specified in the
custom command.

Fixes: #17097
 2023-02-14 08:56:59 -05:00
Brad King 0be3d201c6 Merge topic 'ci-windows-FindPatch' 
1e35257ee1 ci: Enable FindPatch tests on Windows VS builds
04b5df1f3a Tests: Fix FindPatch test with VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8200
 2023-02-14 08:50:34 -05:00
Brad King 6fc83d7a25 Merge branch 'release-3.26' 2023-02-14 08:46:18 -05:00
Brad King aec5dd482f Merge topic 'lcc-major-version' 
2a75edb342 LCC: Fix extraction of __LCC__ version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8199
 2023-02-14 08:46:18 -05:00
Brad King d18dd364d3 Merge topic 'lcc-major-version' into release-3.26 
2a75edb342 LCC: Fix extraction of __LCC__ version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8199
 2023-02-14 08:46:17 -05:00
Kitware Robot df52b85b07 CMake Nightly Date Stamp 2023-02-14 00:01:11 -05:00
Brad King 6cf281b108 Tests: Add dedicated RunCMake.ExtraGenerators test 
The `Simple_${extraGenerator}` tests do not actually need to compile
because they only smoke test CMake's generation of the extra project
files.
 2023-02-13 18:15:29 -05:00
Alexander Neundorf 8802b81b0d Kate: don't include files in the CMakeFiles/ dir in the project 
These files are generated by cmake, they shouldn't be in the project.
 2023-02-13 22:36:47 +01:00
Brad King 1e35257ee1 ci: Enable FindPatch tests on Windows VS builds 
The `patch` tool comes with Git for Windows, which is installed on our
Windows CI hosts as part of running their gitlab-runner.
 2023-02-13 12:35:46 -05:00
Brad King 04b5df1f3a Tests: Fix FindPatch test with VS generators 
Tell CTest the project used to name the `.sln` file.
 2023-02-13 12:35:44 -05:00
Brad King 2a75edb342 LCC: Fix extraction of __LCC__ version components 
Previously the logic only worked for major versions of the form `1.xx`.
Fix it to work with versions `2.xx` and above.
 2023-02-13 09:29:32 -05:00
Brad King 93edb4d0c0 Merge topic 'deprecate-pre-3.5' 
3a4791548d Deprecate compatibility with CMake versions older than 3.5
1edf138506 Tests/RunCMake: Update cmake_minimum_required versions
65a1c379ee Tests/CTestTest*: Update cmake_minimum_required versions
589e6fdcd1 Tests: Update cmake_minimum_required versions in a few tests
3092b14ed0 Tests: Teach RunCMake to optionally ignore policy version deprecation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8192
 2023-02-13 09:08:23 -05:00
Kitware Robot 52f62cbffe CMake Nightly Date Stamp 2023-02-13 00:02:29 -05:00
Kitware Robot 323f5feb93 CMake Nightly Date Stamp 2023-02-12 00:01:15 -05:00
Brad King b44f50cd1a Merge branch 'release-3.26' 2023-02-11 06:33:20 -05:00
Brad King 49f32b27ed Merge topic 'test-https-connections' 
3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs
17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8194
 2023-02-11 06:33:20 -05:00
Brad King e66bd7f584 Merge topic 'test-https-connections' into release-3.26 
3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs
17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8194
 2023-02-11 06:33:19 -05:00
Brad King 3a4791548d Deprecate compatibility with CMake versions older than 3.5 
Issue a deprecation warning on calls to `cmake_minimum_required` or
`cmake_policy` that set policies based on versions older than 3.5.
Note that the effective policy version includes `...<max>` treatment.
Update the check from commit 5845c218d7 (Deprecate compatibility with
CMake versions older than 2.8.12, 2020-06-12, v3.19.0-rc1~629^2).
 2023-02-11 06:25:11 -05:00
Brad King 1edf138506 Tests/RunCMake: Update cmake_minimum_required versions 
For policy-specific tests, use the version before the policy was
introduced.  Otherwise, use 3.5 where possible.

Also, remove `cmake_minimum_required()` and `project()` calls from
individual cases where they are handled by `CMakeLists.txt`.
 2023-02-11 06:24:22 -05:00
Kitware Robot 48c69eeafe CMake Nightly Date Stamp 2023-02-11 00:01:12 -05:00
Ben Boeckel b6a5382217 Ninja: depend on language module information files directly 
Now that `GetLinkedTargetDirectories` can get the exact dependencies,
use them to simplify the collation dependency graph.
 2023-02-10 18:42:02 -05:00
Ben Boeckel 0ace6053e8 Ninja: track modmap dependencies properly 
Mark modmaps as outputs of the collation step.
 2023-02-10 18:03:15 -05:00
Ben Boeckel b215cbc07d Ninja: remove the modmap as an output of the scanner 
It's actually an output of the collator.
 2023-02-10 17:51:46 -05:00
Brad King 3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs 2023-02-10 12:22:00 -05:00
scivision 17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY 
Occasionally curl updates introduce errors in https verification.
Add an explicit test for this capability, activated by an undocumented
option that we can use in CI to specify a URL to test.

Co-authored-by: Brad King <brad.king@kitware.com>
Fixes: #24405
Issue: #24147
Issue: #24398
 2023-02-10 12:22:00 -05:00
Brad King 78299083d2 Merge topic 'cmake-gui-browse-manual-page' 
b5383bc767 cmake-gui: Add optional filename argument to --browse-manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8190
 2023-02-10 10:03:30 -05:00
Brad King f888d03c70 Merge topic 'update-kwsys' 
9ef25b08e0 bootstrap: Update for KWSys removal of String.hxx
e66d42ef10 Merge branch 'upstream-KWSys' into update-kwsys
fa9b4e530f KWSys 2023-02-09 (3eea0b90)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8188
 2023-02-10 10:02:40 -05:00
Brad King 9f7a584173 Merge branch 'release-3.26' 2023-02-10 09:58:49 -05:00
Brad King 81dfe0a330 Merge topic 'curl-macos-tls' 
0d312728eb curl: Backport upstream fix for SecureTransport on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8193
 2023-02-10 09:58:49 -05:00
Brad King 9b7d086220 Merge topic 'curl-macos-tls' into release-3.26 
0d312728eb curl: Backport upstream fix for SecureTransport on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8193
 2023-02-10 09:58:48 -05:00
Brad King 65a1c379ee Tests/CTestTest*: Update cmake_minimum_required versions 2023-02-10 09:51:46 -05:00