Commit Graph

43682 Commits

Author SHA1 Message Date
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
Brad King
66bba23a4b Merge branch 'release-3.14' 2019-05-31 10:39:09 -04:00
Brad King
f3e9a6ff62 CMake 3.14.5 v3.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
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
Brad King
2d0b0e2b9d Do not exclude include directories made implicit by CPATH
Entries of the `CPATH` environment variable are implicitly searched as
include directories by some C/C++ compilers.  Since commit 5990ecb741
(Compute implicit include directories from compiler output, 2018-12-07,
v3.14.0-rc1~108^2) these entries are detected by CMake and included in
the `CMAKE_{C,CXX}_IMPLICIT_INCLUDE_DIRECTORIES` variables.

However, we should not exclude them from explicit specification via `-I`
or particularly `-isystem` because they are meant as user-specified
include directories that can be re-ordered without breaking compiler
builtin headers.  In particular, we need explicit requests via
`include_directories` with the `SYSTEM` option to result in `-isystem`
so that third-party headers do not produce warnings.

Co-Author: Ben Boeckel <ben.boeckel@kitware.com>
Fixes: #19291
2019-05-30 09:24:59 -04:00
Marc Chevrier
4a871d51a3 FindPython*: remove erroneous code 2019-05-30 13:40:46 +02:00
Craig Scott
49f5b6f7bf Help: Document the expire and external discussion resolve states
Our practice of closing MRs temporarily while discussion
takes place in a separate issue isn't always well understood
by MR authors. Expiring a MR seems to be better understood,
but making it clear that it is also a temporary state is helpful.
2019-05-30 19:45:54 +10:00
Kitware Robot
c68efd196e CMake Nightly Date Stamp 2019-05-30 00:01:07 -04:00
Zsolt Parragi
4fe34b2d29 Fixing warnings generated by clang 8.0 on Windows
* Deprecation removals previously specific to MSVC/Intel now also used
  by clang
* String literals were assigned to non const pointers. These are stored
  in mutable arrays now
* An implicit function pointer to pointer conversion is a Microsoft
  extension warning is suppressed by an explicit reinterpret_cast
* The MSVC specific deprecation macro for jsoncpp was moved after the
  clang macro to avoid redefinition warnings. This is consistent with
  how jsoncpp fixed the issue in 36d8cfd7
2019-05-29 18:18:09 +02:00
Patrick Boettcher
b410dd5a05 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2019-05-29 (c42ede9f)
2019-05-29 11:57:17 -04:00
vim-cmake-syntax upstream
06434fc274 vim-cmake-syntax 2019-05-29 (c42ede9f)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit c42ede9f70e53a69f98e5bc5df16f834937dd37c (master).

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

Patrick Boettcher (6):
      4e657a05 update to cmake version 3.13.20181220-g0495c
      b0ada6e2 add <LANG>-replacing in variables.
      60654a65 Update keywords for version 3.14.20190402-g56ae2
      33e512bd format brace-encapsulated variables (varname from var)
      a3628ebb fix keywords of generator-expressions wrongly colored in simple arguments
      c42ede9f update to cmake version 3.14.20190529-g067a4f
2019-05-29 11:53:59 -04:00
Vitaly Stakhovsky
57cedb18c0 cmSystemTools: std::string parameters for tar functions 2019-05-29 09:56:08 -04:00
Brad King
067a4f484b Merge topic 'clang-gnulike-support'
74829f01b1 Help: Add notes for topic 'clang-gnulike-support'
19669abe1d Tests: handle string escaping differences with NMake+clang
a2a90f41e3 Tests: require C++14 for the Tutorial
4819ff9647 Tests: fix failures with gnu mode clang on windows
26af0b25e7 cmake: use correct stack size with gnu mode clang on windows
d44c0db0b2 clang: setup correct configuration in gnu mode
b7d5ef23e9 cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu mode
3d0210d8dc binutils: add the llvm-* variants to the tool lists.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Francesco Bertolaccini <francesco@bertolaccini.dev>
Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com>
Acked-by: Saleem Abdulrasool <compnerd@compnerd.org>
Merge-request: !2992
2019-05-29 09:22:12 -04:00
Brad King
8b42d56002 Merge topic 'FindZLIB-names'
4ff3ab2ac9 FindZLIB: Add more zlib library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3384
2019-05-29 09:19:38 -04:00
Brad King
5a720a30fa Merge topic 'samu'
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3380
2019-05-29 09:18:35 -04:00
Brad King
a1c291e0ac Merge topic 'swift-wrapper'
6baa80d1e3 Modules: correct linker wrapper flag for Swift

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3390
2019-05-29 09:17:44 -04:00
Brad King
f093ac36c0 Merge topic 'linker-preference'
abea06efdf Modules: setup `CMAKE_Swift_LINKER_PREFERENCE`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3373
2019-05-29 09:16:17 -04:00
Brad King
0f9d7dc3ba Merge topic 'findopenmp-new-dates'
26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3375
2019-05-29 09:15:09 -04:00
Sebastian Holtermann
6136ab5e17 Ninja: Use cmNinjaRule as sole parameter in the WriteRule and AddRule methods
Instead of passing multiple strings to the `WriteRule` and `AddRule` methods
of `cmGlobalNinjaGenerator`, pass only a `cmNinjaRule` instance reference,
that is set up beforehand.

Adapt calls to `WriteRule` and `AddRule` in multiple places.
2019-05-29 13:04:52 +02:00
Sebastian Holtermann
6a23fbce47 Ninja: Add cmNinjaRule class 2019-05-29 12:59:31 +02:00
Kitware Robot
7c39a9c6b6 CMake Nightly Date Stamp 2019-05-29 00:01:08 -04:00
Brad King
c7db6ce986 Merge topic 'flex'
a7754448f6 FindFLEX: fix example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3379
2019-05-28 14:59:48 -04:00
Alexander Neumann
4ff3ab2ac9 FindZLIB: Add more zlib library names
Account for all names that can be generated by the upstream zlib build
system.

Issue: #18029
2019-05-28 14:51:45 -04:00
Dennis Klein
35bfc85d95 FindBoost: Refactor debug messages
* Deduplicate code with helper functions
* Remove double printing of _boost_TEST_VERSIONS
* Fix #19158
* Add printing of a few additional variables
2019-05-28 20:46:43 +02:00
Michael Forney
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM
`samurai` is an alternative implementation of ninja and is a drop-in
replacement.  `samu --version` reports the ninja version it is
compatible with.
2019-05-28 14:16:29 -04:00
Saleem Abdulrasool
6baa80d1e3 Modules: correct linker wrapper flag for Swift
This was sitting locally but was missed in previous commits.  This
enables the use of `LINKER:` when building Swift code bases.
2019-05-28 09:21:41 -07:00
Brad King
45e4f470c0 Merge branch 'release-3.14' 2019-05-28 11:59:22 -04:00
Brad King
dfd2e0a4ed Merge topic 'FindThreads-doc-c++'
a38b63c1bb FindThreads: Drop incorrect docs about usage with C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3391
2019-05-28 11:58:07 -04:00