mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
43,787 Commits 2 Branches 401 Tags
3d8216330da76bac8267d64d4940af0b05e502a9
Commit Graph

43787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 3d8216330d Merge branch 'find_package_prefer_config_fix' into release-3.15 
Merge-request: !3446
 2019-06-17 07:59:46 -04:00
Brad King e815fad43f Merge branch 'capabilities-fileapi' into release-3.15 
Merge-request: !3442
 2019-06-17 07:56:39 -04:00
Cristian Adam 22e65d10c1 find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallback 
Fixes: #19361
 2019-06-13 23:58:30 +02:00
Craig Scott 95b9d6af80 Merge branch 'cmake-gui-qt-notice' into release-3.15 
Merge-request: !3441
 2019-06-13 06:58:22 -04:00
Brad King d63398d32d fileapi: Suppress lint warning about non-move with old jsoncpp 2019-06-12 12:51:32 -04:00
Brad King c1d6b135ed cmake-gui: Update Qt copyright holder in About dialog 
Qt is now copyright "The Qt Company Ltd.".
 2019-06-12 12:39:25 -04:00
Brad King 069e42f7c3 Merge branch 'CheckCXXSymbolExists-xref' into release-3.15 
Merge-request: !3437
 2019-06-12 11:50:33 -04:00
Rolf Eike Beer f26c3d5c60 CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C version 2019-06-12 11:48:56 -04:00
Brad King fa00a3b29b Merge branch 'capabilities-fileapi' into release-3.15 
Merge-request: !3433
 2019-06-12 11:42:44 -04:00
Craig Scott 8d3c919a3c Merge branch 'additional_clean_files_help' into release-3.15 
Merge-request: !3428
 2019-06-08 16:58:19 +10: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 c932f49842 cmake: Teach -E capabilities to report supported fileapi requests 
Fixes: #19339
 2019-06-07 11:08:38 -04:00
Brad King 6696855f72 cmake: Simplify implementation of -E capabilities 
The `cmake -E capabilities` command-line tool is implemented only in a
full-featured (non-bootstrap) CMake, and server mode is now always
available in this case.
 2019-06-07 11:08:38 -04:00
Brad King 6b815e58ba fileapi: Factor out helper to construct a version object 2019-06-07 11:08:38 -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
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 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
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
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 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
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 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
Brad King 65f5df7d08 Merge topic 'executables-are-consoled' 
b06f4c8a74 Swift: disallow WIN32_EXECUTABLE properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3410
 2019-06-04 08:34:21 -04:00
Brad King 9ba901eb3c Merge topic 'swift-linker-flags' 
7456739e24 Swift: avoid `CMAKE_{EXE,SHARED}_LINKER_FLAGS`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3406
 2019-06-04 08:33:14 -04:00
Brad King 4b68baa776 Merge topic 'compiler_id_gen_exp_supports_multiple_ids' 
162555d7ec Help: Add release notes for updated generator expressions
808b818063 Genex: CompileLang and CompileLangAndId now match against a list of ids
9fd602bfd3 Genex: PlatformId now can match against a list of ids.
ec66af2026 Genex: CompilerId now can match against a list of ids.
2d4787fc4d Genex: Add more extensive support for an unbounded number of parameters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3405
 2019-06-04 08:32:19 -04:00
Brad King d4108f5585 Merge topic 'check_language_respects_cuda_host_compiler' 
fada8cbfd6 CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3407
 2019-06-04 08:30:26 -04:00
Brad King 99b9b01c02 Merge topic 'print-correct-line-number' 
3475e2728b cmListFileCache: When missing ending ) print starting line instead of last one

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3398
 2019-06-04 08:28:09 -04:00
Brad King e591e22d4c Merge topic 'better_error_message_for_visibility_preset_property' 
619416f8a3 The error message for VISIBILITY_PRESET now documents valid options.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3409
 2019-06-04 08:25:47 -04:00
Brad King 7561fcda09 Merge topic 'test-explicit-dirs' 
f263650f95 Tests: Fix RunCMake.CommandLine test to use generator in no-S-B case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3414
 2019-06-04 08:24:29 -04:00
Kitware Robot 99496f5776 CMake Nightly Date Stamp 2019-06-04 00:01:06 -04:00
Brad King f263650f95 Tests: Fix RunCMake.CommandLine test to use generator in no-S-B case 
Apply the fix from commit baed22c4b0 (Tests: Fix RunCMake.CommandLine
test to use generator with -S and -B, 2019-04-10) to the `no-S-B` case
too.  It also generates a build system and should use the generator
being tested.
 2019-06-03 14:57:19 -04:00
John Freeman 07a80c7002 cmake: Teach -E remove_directory to remove multiple directories 
The `make_directory` command can make multiple directories in a single
invocation.  Make `remove_directory` mirror that behavior.
 2019-06-03 14:20:00 -04:00