mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
43,797 Commits 2 Branches 401 Tags
d93fe90c17de741c3986c3b13a6c5f5653a8104e
Commit Graph

43797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott d93fe90c17 Merge topic 'additional_clean_files_help' 
e61074c672 Help: Improve ADDITIONAL_CLEAN_FILES documentation
cebccdebaf Help: Move ADDITIONAL_MAKE_CLEAN_FILES dir prop to deprecated section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3428
 2019-06-08 02:53:21 -04:00
Kitware Robot 0e96fdbc15 CMake Nightly Date Stamp 2019-06-08 00:01:06 -04:00
Brad King 891b555951 Merge branch 'release-3.15' 2019-06-07 11:16:30 -04:00
Brad King 43316424d0 Merge branch 'autogen_header_in_symbolic_path_fix' into release-3.15 
Merge-request: !3431
 2019-06-07 11:16:04 -04:00
Brad King 8be4b173f1 Merge topic 'autogen_header_in_symbolic_path_fix' 
00e6b67e0c Autogen: Fix header detection for paths with symbolic links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3431
 2019-06-07 11:14:20 -04:00
Sebastian Holtermann e61074c672 Help: Improve ADDITIONAL_CLEAN_FILES documentation 
Extend the `ADDITIONAL_CLEAN_FILES' target and directory property
documentation.

Fixes: #19341
 2019-06-07 21:10:19 +10:00
Craig Scott cebccdebaf Help: Move ADDITIONAL_MAKE_CLEAN_FILES dir prop to deprecated section 2019-06-07 21:08:08 +10:00
Kitware Robot e2414ee13d CMake Nightly Date Stamp 2019-06-07 00:01:07 -04:00
Sebastian Holtermann 00e6b67e0c Autogen: Fix header detection for paths with symbolic links 
When Autogen searches the header for a source files in a target,
the expanded real path is used and not the (possibly symbolic) original path
of the source file.  If the source file path contains symbolic links, then the
correct `cmSourceFile` instance of the header won't be found, but a new one
will be generated.  This way all header source file properties get lost, which
is problematic especially for the `SKIP_AUTOMOC/UIC/GEN` properties.

This patch changes the header detection in Autogen to use the original source
file path instead of the expanded real source file path.

Fixes: #19346
 2019-06-06 14:14:19 -04:00
Brad King 0b3ba05a9b Merge topic 'cmTarget_cleanups' 
0e4493ec67 cmOutputConverter: Initialize static std::set on construction
f1bdfdf242 cmAddCustomCommand: Initialize static std::unordered_set on construction
8af4b31b8a cmTargetPropertyComputer: Initialize static std::unordered_set on construction
537ea119b9 cmTarget: Initialize static std::unordered_set on construction
c4826787d5 cmTarget: Property initialization cleanup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3416
 2019-06-06 14:07:23 -04:00
Brad King 6aee82f325 Merge branch 'release-3.15' 2019-06-06 10:34:32 -04:00
Brad King 676a0bf9bc Merge topic 'doc-xlclang-id' 
923f58ec73 Help: Document XLClang compiler id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3430
 2019-06-06 10:33:06 -04:00
Brad King baf3a84eff Merge topic 'cpack-nuget-case' 
8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Merge-request: !3427
 2019-06-06 10:32:10 -04:00
Brad King 1f466935da Merge branch 'doc-xlclang-id' into release-3.15 
Merge-request: !3430
 2019-06-06 10:18:33 -04:00
Brad King 923f58ec73 Help: Document XLClang compiler id 
This compiler id was added by commit 90c6156aa8 (XLClang: Add a new
compiler ID for the clang-based XL compiler, 2019-02-05,
cpp-modules-20190312.1~71^2~7).  Add documentation accidentally left out
of that commit.

Issue: #18835
 2019-06-06 10:13:47 -04:00
Kitware Robot 9ef92b7d7d CMake Nightly Date Stamp 2019-06-06 00:01:06 -04:00
Brad King 8c704cfad4 Merge branch 'release-3.15' 2019-06-05 10:01:14 -04:00
Brad King 8a07d511af Merge topic 'doc-FindEnvModule-typos' 
15de26c7f3 Help: Trivial typo and grammar fixes for FindEnvModules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3425
 2019-06-05 09:59:33 -04:00
Brad King 501a3cf195 Merge branch 'cpack-nuget-case' into release-3.15 
Merge-request: !3427
 2019-06-05 09:58:41 -04:00
Brad King 556277eb10 Merge branch 'doc-FindEnvModule-typos' into release-3.15 
Merge-request: !3425
 2019-06-05 09:58:26 -04:00
Mathieu Malaterre 8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system 
There is no need to use a CamelCase executable name since it will be
handled gracefully on Windows anyway.  This change allow support for
Linux system, in particular Debian distribution where the binary is
called `nuget`.
 2019-06-05 09:32:22 -04:00
Craig Scott 15de26c7f3 Help: Trivial typo and grammar fixes for FindEnvModules 2019-06-05 20:55:18 +10:00
Kitware Robot 6ca497365a CMake Nightly Date Stamp 2019-06-05 00:01:09 -04:00
Brad King 6a78bdbb06 Merge branch 'release-3.15' 2019-06-04 12:29:55 -04:00
Brad King a423194311 Merge branch 'ctest_xml_tweaks' into release-3.15 
Merge-request: !3423
v3.15.0-rc1 		2019-06-04 12:29:02 -04:00
Brad King ac16778a12 Merge topic 'ctest_xml_tweaks' 
c0f00079a9 Tests: Fix RunCMake.ctest_update test to not require GIT_EXECUTABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3423
 2019-06-04 12:28:14 -04:00
Brad King c0f00079a9 Tests: Fix RunCMake.ctest_update test to not require GIT_EXECUTABLE 
Fix the test case added by commit 95db11fdb1 (ctest: Include ChangeId in
Update.xml, 2019-04-23) to work in a release branch of CMake.
The `GIT_EXECUTABLE` value is not set before we add this test in
release branch builds.
 2019-06-04 12:27:32 -04:00
Brad King 0eeb3690d1 Merge branch 'GetPrerequisites-variable-typo' into release-3.15 
Merge-request: !3421
 2019-06-04 12:11:21 -04:00
Sebastian Holtermann 0e4493ec67 cmOutputConverter: Initialize static std::set on construction 2019-06-04 18:11:19 +02:00
Sebastian Holtermann f1bdfdf242 cmAddCustomCommand: Initialize static std::unordered_set on construction 2019-06-04 18:11:19 +02:00
Sebastian Holtermann 8af4b31b8a cmTargetPropertyComputer: Initialize static std::unordered_set on construction 2019-06-04 18:11:19 +02:00
Sebastian Holtermann 537ea119b9 cmTarget: Initialize static std::unordered_set on construction 2019-06-04 18:11:19 +02:00
Sebastian Holtermann c4826787d5 cmTarget: Property initialization cleanup 2019-06-04 18:11:19 +02:00
Brad King 0a68c30b81 Merge topic 'GetPrerequisites-variable-typo' 
0da2c35d6b GetPrerequisites: fix regression in gp_append_unique

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3421
 2019-06-04 12:09:41 -04:00
Ben Boeckel 0da2c35d6b GetPrerequisites: fix regression in gp_append_unique 
The `item` variable was the loop variable in the old code prior to
commit 3dfc8b9bd6 (GetPrerequisites: use if(IN_LIST) instead of foreach,
2019-05-09).  The function argument `value` should be used instead.
 2019-06-04 12:00:06 -04:00
Brad King 98004612f6 Begin post-3.15 development 2019-06-04 10:56:45 -04:00
Brad King 4ec377f5c2 Merge branch 'release-3.15' 2019-06-04 10:55:43 -04:00
Brad King 9d78ce0293 CMake 3.15.0-rc1 version update 2019-06-04 10:55:08 -04:00
Brad King 118bd8b53e Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2019-06-04 10:54:19 -04:00
Brad King dae9b3e16f Merge topic 'doc-3.15-relnotes' 
4272297b6e Help: Organize and revise 3.15 release notes
01d5730411 Help: Consolidate 3.15 release notes
e075e64fd8 Help: Document Swift_DEPENDENCIES_FILE property defaults

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3420
 2019-06-04 10:51:52 -04:00
Brad King 4272297b6e Help: Organize and revise 3.15 release notes 
Add section headers similar to the 3.14 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2019-06-04 10:37:29 -04:00
Brad King 01d5730411 Help: Consolidate 3.15 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.15.rst`.
 2019-06-04 09:55:37 -04:00
Brad King e075e64fd8 Help: Document Swift_DEPENDENCIES_FILE property defaults 
Copy wording from the release notes.
 2019-06-04 09:55:37 -04:00
Brad King 4d80bd5cd5 Merge topic 'tweaks_to_release_notes' 
435f71fe12 Help: Clarify COMPILE_LANG_AND_ID release note
9098d31760 Help: Clarify vs-just-my-code-debugging release note language
bb8b3727c9 Help: Reference project command in CMAKE_PROJECT_INCLUDE_BEFORE relnotes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3419
 2019-06-04 08:46:33 -04:00
Robert Maynard 435f71fe12 Help: Clarify COMPILE_LANG_AND_ID release note 2019-06-04 08:45:49 -04:00
Robert Maynard 9098d31760 Help: Clarify vs-just-my-code-debugging release note language 2019-06-04 08:45:49 -04:00
Robert Maynard bb8b3727c9 Help: Reference project command in CMAKE_PROJECT_INCLUDE_BEFORE relnotes 2019-06-04 08:45:49 -04:00
Brad King 842f70c493 Merge topic 'emulator-arguments' 
fec441ec17 Teach CROSSCOMPILING_EMULATOR to support arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3402
 2019-06-04 08:37:55 -04:00
Brad King a7d2efc15b Merge topic 'remove_directories' 
07a80c7002 cmake: Teach -E remove_directory to remove multiple directories
013bee698e Tests: Add RunCMake.CommandLine make_directory test checks
3eb16de327 Tests: Fix RunCMake.CommandLine make_directory test name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3411
 2019-06-04 08:37:04 -04:00
Brad King 36140d864e Merge topic 'ninja-nvcc-rsp' 
d91b5a72cd Ninja: Add support for CUDA nvcc response files
5efac09bed Ninja: Compute linker response file flag earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3399
 2019-06-04 08:35:47 -04:00