Commit Graph

43906 Commits

Author SHA1 Message Date
Brad King 7e1c3b3645 Merge branch 'release-3.14' 2019-05-31 09:07:44 -04:00
Brad King 82fec3784b Merge topic 'vs-depends-dedup'
42bc67bd43 VS: De-duplicate custom command dependencies
d03a6fc857 VS: Clarify name of custom commands AdditionalInputs variable
fcedf8e552 VS: Isolate custom command input/output generation scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3388
2019-05-31 09:04:47 -04:00
Brad King 0d025f75c1 Merge topic 'implicit-includes-CPATH'
2d0b0e2b9d Do not exclude include directories made implicit by CPATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3395
2019-05-31 09:03:28 -04:00
Kitware Robot ebee9ff160 CMake Nightly Date Stamp 2019-05-31 00:01:06 -04:00
Brad King c0b560f664 Merge topic 'update-vim-syntax'
b410dd5a05 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
06434fc274 vim-cmake-syntax 2019-05-29 (c42ede9f)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3394
2019-05-30 14:14:22 -04:00
Brad King dd7ba6ff19 Merge branch 'vs-depends-dedup' into release-3.14
Merge-request: !3388
2019-05-30 14:11:19 -04:00
Frans van Dorsselaer 42bc67bd43 VS: De-duplicate custom command dependencies
Avoid listing the same input more than once in custom commands generated
in `.vcxproj` and `.csproj` files.  In the case of a `.vcxproj` file
additionally avoid listing the source to which the command is attached
since it is already implicitly a dependency.

This is a nice cleanup and also works around a VS 2019 16.1 regression
in MSBuild dependency checking.  Starting with that version, MSBuild now
re-builds custom commands when the list of dependencies has changed.
However, its check is confused by duplicate dependencies.
De-duplicating them avoids this problem.

Co-Author: Brad King <brad.king@kitware.com>
Fixes: #19303
2019-05-30 13:57:03 -04:00
Frans van Dorsselaer d03a6fc857 VS: Clarify name of custom commands AdditionalInputs variable 2019-05-30 13:57:03 -04:00
Brad King fcedf8e552 VS: Isolate custom command input/output generation scopes 2019-05-30 13:57:03 -04:00
Marc-André Moreau fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC 2019-05-30 13:11:34 -04:00
Sebastian Holtermann 7d9e66a405 Ninja: Remove non cmNinjaBuild based WriteBuild method 2019-05-30 18:38:21 +02:00
Sebastian Holtermann ccf9507956 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:21 +02:00
Sebastian Holtermann df06c8d792 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:21 +02:00
Sebastian Holtermann 409922f695 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:21 +02:00
Sebastian Holtermann 7fd3811400 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann 834ec4ebfe Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann 465d6d7f9b Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann 4c9e99e1f9 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann cba8584517 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann c79b666c43 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann 477f9e3095 Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann fc451f130d Ninja: Use cmNinjaBuild class for WriteBuild 2019-05-30 18:38:20 +02:00
Sebastian Holtermann 2dc483476c Ninja: Remove WritePhonyBuild method 2019-05-30 18:38:20 +02:00
Sebastian Holtermann 5823510745 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann fe018819cb Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann c367f7d546 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann 1e7e47f597 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann e97ea52010 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann 43af4ca78e Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann e762da6dc9 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:19 +02:00
Sebastian Holtermann 0d0cb136fb Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:38:14 +02:00
Sebastian Holtermann 09c21914b3 Ninja: Embrace temporary objects in scopes 2019-05-30 18:21:40 +02:00
Sebastian Holtermann dff42d4812 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:21:40 +02:00
Sebastian Holtermann df72f06182 Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:21:40 +02:00
Sebastian Holtermann 0eed548d3f Ninja: Use cmNinjaBuild instead of WritePhonyBuild 2019-05-30 18:21:40 +02:00
Sebastian Holtermann b6dc977ff1 Ninja: Embrace temporary objects in scopes 2019-05-30 18:21:40 +02:00
Sebastian Holtermann 846b4b1062 Ninja: Make WriteCustomCommandBuild method use cmNinjaBuild internally 2019-05-30 18:21:36 +02:00
Sebastian Holtermann 8a46a07c8b Ninja: Make WriteMacOSXContentBuild use cmNinjaBuild internally 2019-05-30 16:44:30 +02:00
Sebastian Holtermann 15c644437a Ninja: Add cmNinjaBuild based WriteBuild (wrapper) method 2019-05-30 16:44:30 +02:00
Sebastian Holtermann 1b16d76567 Ninja: Add cmNinjaBuild utility class 2019-05-30 16:44:30 +02:00
Brad King 7a8a24d028 Merge topic 'FindBoost-debug-messages'
35bfc85d95 FindBoost: Refactor debug messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3382
2019-05-30 10:41:14 -04:00
Kinan Mahdi 42e14d90b1 VS: Added support for VS package references for nuget 2019-05-30 10:22:44 -04:00
Brad King 5bb1e9a382 Merge topic 'doc-mr-resolve-states'
49f5b6f7bf Help: Document the expire and external discussion resolve states

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3377
2019-05-30 10:09:05 -04:00
Brad King a6a04cc446 Merge topic 'fix-clang-warnings'
4fe34b2d29 Fixing warnings generated by clang 8.0 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3396
2019-05-30 09:58:37 -04:00
Brad King 6e8acc51a5 Merge topic 'string-tar'
57cedb18c0 cmSystemTools: std::string parameters for tar functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3392
2019-05-30 09:57:11 -04:00
Brad King 9dad42d21a Merge topic 'ninja_rule_class'
6136ab5e17 Ninja: Use cmNinjaRule as sole parameter in the WriteRule and AddRule methods
6a23fbce47 Ninja: Add cmNinjaRule class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3393
2019-05-30 09:53:09 -04:00
Brad King 05af1770a0 Merge topic 'tar-zstd-compression'
53cb1f2d04 cmake: Teach cmake -E tar command, Zstandard compression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3357
2019-05-30 09:39:35 -04:00
Brad King 3a7f493b7b Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2019-05-30 (f892bacf)
2019-05-30 09:31:35 -04:00
KWSys Upstream 9ef1e13bcc KWSys 2019-05-30 (f892bacf)
Code extracted from:

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

at commit f892bacf6c563b1f6fb843ffb623b434bc2ded4f (master).

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

Zsolt Parragi (1):
      887b1da5 Fixing issues when building with clang 8.0 on Windows
2019-05-30 09:31:29 -04:00
Brad King 540a175d20 Merge branch 'implicit-includes-CPATH' into release-3.14
Merge-request: !3395
2019-05-30 09:27:17 -04:00