Commit Graph

28354 Commits

Author SHA1 Message Date
Kyle Edwards
5395bf05eb string: Add new HEX sub-command 2020-02-19 09:11:05 -05:00
Kitware Robot
952945813c CMake Nightly Date Stamp 2020-02-19 00:01:16 -05:00
Brad King
308563940a Merge topic 'update-kwsys'
0f9111be36 Merge branch 'backport-kwsys-copy-fix' into update-kwsys
ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion
fc6eced05e Merge branch 'upstream-KWSys' into update-kwsys
96dd383ceb KWSys 2020-02-17 (3e117fe1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4361
2020-02-18 11:49:00 -05:00
Brad King
a0318e8fc8 Merge topic 'deprecate-policy-old'
c78ae16d81 Add deprecation warnings for policies CMP0071 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4369
2020-02-18 11:24:15 -05:00
Brad King
2ee4b288ad Merge topic 'ninja-multi-framework-dependency-autogen-fix'
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4363
2020-02-18 11:20:56 -05:00
Kitware Robot
3276f85fd7 CMake Nightly Date Stamp 2020-02-18 00:01:09 -05:00
Brad King
fc6eced05e Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-02-17 (3e117fe1)
2020-02-17 11:59:07 -05:00
Brad King
c78ae16d81 Add deprecation warnings for policies CMP0071 and below
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.10 and below to encourage projects to port away
from setting policies to OLD.
2020-02-17 11:44:57 -05:00
Kyle Edwards
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix 2020-02-17 10:51:48 -05:00
Brad King
b782fc9390 Merge topic 'makefiles-deep-configure'
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4359
2020-02-17 10:26:05 -05:00
Kyle Edwards
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen
Fixes: #20345
2020-02-17 08:24:57 -05:00
Kitware Robot
6d00a2de7b CMake Nightly Date Stamp 2020-02-17 00:01:13 -05:00
Kitware Robot
333a0507c0 CMake Nightly Date Stamp 2020-02-16 00:01:46 -05:00
Kitware Robot
8be99c62ea CMake Nightly Date Stamp 2020-02-15 00:01:14 -05:00
Brad King
b78213e30b Merge topic 'update-libarchive'
b83d96f164 libarchive: Update to build within CMake
5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive
8cce62295a LibArchive 2020-02-11 (3288ebb0)
9a27ecd416 libarchive: Update script to get 3.4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4362
2020-02-14 11:16:12 -05:00
Hugh Sorby
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing
Add files configured by all subdirectories to `CMAKE_MAKEFILE_PRODUCTS`
rather than just those from the top level.

Fixes: #19719
2020-02-14 08:50:15 -05:00
Kitware Robot
4bfe0b6f0d CMake Nightly Date Stamp 2020-02-14 00:01:07 -05:00
Brad King
b83d96f164 libarchive: Update to build within CMake
Hard-code more libarchive options as internal cache entries.  Doing so
makes some of our `IF(0)` conditions unnecessary, so remove those.
2020-02-13 12:59:29 -05:00
Kitware Robot
1acea5cb26 CMake Nightly Date Stamp 2020-02-13 00:01:12 -05:00
Kyle Edwards
72229159d7 Merge topic 'ninja-strcat-usage'
6e65b869c3 cmNinjaTargetGenerator: cmStrCat usage
9f6544048f cmGlobalNinjaGenerator: cmStrCat usage
04ac0ea501 cmGlobalNinjaGenerator: factor out /all target name computation
a85bea173a cmGlobalNinjaGenerator: avoid unnecessary string addition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4347
2020-02-12 11:59:21 -05:00
Brad King
125f0451a9 CMake 3.17.0-rc1 2020-02-12 10:32:47 -05:00
Brad King
645474dba1 Merge topic 'ninja-multi-default-configs-fix' into release-3.17
46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4349
2020-02-12 09:15:54 -05:00
Brad King
566a9c8467 Merge topic 'ninja-multi-default-configs-fix'
46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4349
2020-02-12 09:15:54 -05:00
Brad King
10b834a3eb Merge topic 'file-CONFIGURE_DEPENDS-verify-CMP0009' into release-3.17
818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new
b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009
715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4342
2020-02-12 09:15:07 -05:00
Brad King
578ae24eb7 Merge topic 'file-CONFIGURE_DEPENDS-verify-CMP0009'
818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new
b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009
715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4342
2020-02-12 09:15:07 -05:00
Brad King
96ee8b7266 Merge topic 'install-default-fix' into release-3.17
9442ae5083 install: Fix regression when using default destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4340
2020-02-12 09:05:31 -05:00
Brad King
093b57bced Merge topic 'install-default-fix'
dd8d5004a9 Merge branch 'backport-3.16-install-default-fix'
45d5abf4a8 Merge branch 'backport-3.15-install-default-fix'
0a4d829c36 Merge branch 'backport-3.14-install-default-fix'
b519db6217 install: Fix regression when using default destinations
b4b60d1c3a install: Fix regression when using default destinations
9442ae5083 install: Fix regression when using default destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4340
2020-02-12 09:05:31 -05:00
Kitware Robot
c425920cb1 CMake Nightly Date Stamp 2020-02-12 00:01:12 -05:00
Brad King
dd8d5004a9 Merge branch 'backport-3.16-install-default-fix' 2020-02-11 14:59:21 -05:00
Kyle Edwards
46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS
Prior to this fix, CMAKE_NMC_DEFAULT_CONFIGS would inherit "all" from
the union of CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG and
CMAKE_NMC_CROSS_CONFIGS. This is inconsistent with the behavior of the
"all" target signifying CMAKE_NMC_CROSS_CONFIGS. Update "all" in
CMAKE_NMC_DEFAULT_CONFIGS to inherit only from CMAKE_NMC_CROSS_CONFIGS.
2020-02-11 10:49:54 -05:00
Brad King
f104115b3d Merge topic 'link-line-backtrace'
8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace'
e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Dennis Klein <d.klein@gsi.de>
Merge-request: !4344
2020-02-11 09:08:39 -05:00
Brad King
0db0b72156 Merge topic 'link-line-backtrace' into release-3.17
8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace'
e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Dennis Klein <d.klein@gsi.de>
Merge-request: !4344
2020-02-11 09:08:38 -05:00
Shane Parris
818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new
In certain cases, rebuilds with CMake using the CONFIGURE_DEPENDS flag
with GLOB_RECURSE could result in a reconfigure loop due to CMP0009 not
being propogated to the generated VerifyGlobs.cmake script.

During the inital configuration phase, RecurseThroughSymlinksOn() is
called for recursive glob operations either by having the CMP0009 status
not set to NEW or by explicitly providing the FOLLOW_SYMLINKS flag. At
the end when the VerifyGlobs script is created, the FOLLOW_SYMLINKS flag
is written according to the final resolved form through a call to
GetRecurseThroughSymlinks(). Thus, setting CMP0009 to NEW in the
generated file is safe and allows correct behavior whether or not the
end user sets the policy status to NEW or OLD.
2020-02-11 08:45:35 -05:00
Kyle Edwards
9442ae5083 install: Fix regression when using default destinations
In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION
and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression
was introduced, in which an `install(TARGETS)` with a
RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER
DESTINATION would then install the headers.  The old behavior did not do
this.  Restore the old behavior.

Fixes: #20326
2020-02-11 08:34:16 -05:00
Ben Boeckel
6e65b869c3 cmNinjaTargetGenerator: cmStrCat usage 2020-02-11 03:55:50 -05:00
Ben Boeckel
9f6544048f cmGlobalNinjaGenerator: cmStrCat usage 2020-02-11 03:55:50 -05:00
Ben Boeckel
04ac0ea501 cmGlobalNinjaGenerator: factor out /all target name computation 2020-02-11 03:55:50 -05:00
Ben Boeckel
a85bea173a cmGlobalNinjaGenerator: avoid unnecessary string addition 2020-02-11 03:55:50 -05:00
Kitware Robot
d31f31714b CMake Nightly Date Stamp 2020-02-11 00:01:09 -05:00
Brad King
8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace' 2020-02-10 16:17:03 -05:00
Brad King
e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items
Since commit d4d0dd0f6a (cmLinkLineComputer: Add ComputeLinkLibs
overload with backtraces, 2019-09-13, v3.16.0-rc1~87^2~4), backtraces
have been collected by `ComputeLinkLibs` by looking back through the
link implementation libraries for one matching the text of the link line
item.  This is slow in projects with long link lines.

Instead, teach `cmComputeLinkDepends` and `cmComputeLinkInformation` to
carry backtrace information explicitly along with the text of each item.

Fixes: #20322
2020-02-10 16:11:38 -05:00
Brad King
205293d7eb Merge topic 'ninja-multi-depfile'
67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4334
2020-02-10 10:39:49 -05:00
Kitware Robot
799bfb7132 CMake Nightly Date Stamp 2020-02-10 00:01:07 -05:00
Kitware Robot
cb967317e4 CMake Nightly Date Stamp 2020-02-09 00:01:05 -05:00
Kitware Robot
f77f64f793 CMake Nightly Date Stamp 2020-02-08 00:01:08 -05:00
Kyle Edwards
67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()
And give other generators a path forward to add support in the future.
2020-02-07 14:18:54 -05:00
Brad King
3844e2ae4c Merge topic 'cmake-gui-env-platform-defaults'
9a71fa46e7 cmake-gui: set generator field defaults from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4312
2020-02-07 10:37:35 -05:00
Brad King
4e44cbc673 Merge topic 'ninja-multi-default-config-fix'
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
2020-02-07 09:26:37 -05:00
Brad King
135378fd18 Merge topic 'ninja-multi-default-config-fix' into release-3.17
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
2020-02-07 09:26:36 -05:00
Brad King
6c142ac7aa Merge topic 'ninja-multi-no-minsizerel'
9e219de4fb Ninja Multi-Config: Don't include MinSizeRel by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4326
2020-02-07 09:17:26 -05:00