Commit Graph

43765 Commits

Author SHA1 Message Date
Kitware Robot
51e7488c03 CMake Nightly Date Stamp 2019-06-02 00:01:04 -04:00
Kitware Robot
7f4a1d8379 CMake Nightly Date Stamp 2019-06-01 00:01:07 -04:00
Brad King
187928875d Merge topic 'vs-add-package-reference'
42e14d90b1 VS: Added support for VS package references for nuget

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Merge-request: !3389
2019-05-31 13:18:31 -04:00
Marc Chevrier
52b298bd03 FindPython: ensure Python_ROOT_DIR is always searched first 2019-05-31 19:05:04 +02:00
Brad King
66bba23a4b Merge branch 'release-3.14' 2019-05-31 10:39:09 -04:00
Brad King
f3e9a6ff62 CMake 3.14.5 2019-05-31 09:18:58 -04:00
Brad King
720253393c Merge topic 'ninja-cmcldeps'
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3404
2019-05-31 09:10:51 -04:00
Brad King
ec4d70b564 Merge topic 'update-kwsys'
3a7f493b7b Merge branch 'upstream-KWSys' into update-kwsys
9ef1e13bcc KWSys 2019-05-30 (f892bacf)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3401
2019-05-31 09:09:30 -04:00
Brad King
d8e90be04d Merge topic 'FindPython-remove-erroneous-code'
4a871d51a3 FindPython*: remove erroneous code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3400
2019-05-31 09:08:40 -04:00
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