Commit Graph

28373 Commits

Author SHA1 Message Date
Brad King
d5e7bb1b4b Merge topic 'ctest-failure-error-reporting'
a5be3916ee CTest: Provide more detailed information on resource allocation error
f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources()
f1c34443b7 CTest: Improve error reporting with bad working directory for tests
1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4390
2020-02-25 09:00:25 -05:00
Brad King
64ed4f6f99 Merge topic 'cuda-non-device-link'
7da2c8c543 Merge branch 'backport-cuda-non-device-link'
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4376
2020-02-25 08:54:45 -05:00
Kitware Robot
2fb84a9352 CMake Nightly Date Stamp 2020-02-25 00:01:09 -05:00
Kyle Edwards
a5be3916ee CTest: Provide more detailed information on resource allocation error 2020-02-24 15:44:01 -05:00
Kyle Edwards
f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources() 2020-02-24 15:44:01 -05:00
Kyle Edwards
f1c34443b7 CTest: Improve error reporting with bad working directory for tests 2020-02-24 15:44:01 -05:00
Kyle Edwards
1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure() 2020-02-24 15:44:01 -05:00
Brad King
7da2c8c543 Merge branch 'backport-cuda-non-device-link' 2020-02-24 13:34:13 -05:00
Francisco Facioni
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools
Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response
files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file`
option to avoid long link command lines via a response file.  However,
for non-device linking the host tools are used and the option does not
make sense.  Update the logic to use `--options-file` only for device
linking.  Linking with the host tools already has its own logic for
response files.

Fixes: #19954
2020-02-24 13:31:33 -05:00
Kitware Robot
5fa6f8192e CMake Nightly Date Stamp 2020-02-24 00:01:05 -05:00
Kitware Robot
3671a928d0 CMake Nightly Date Stamp 2020-02-23 00:01:05 -05:00
Kitware Robot
bdeda3691b CMake Nightly Date Stamp 2020-02-22 00:01:06 -05:00
Kitware Robot
25ca8e5ce5 CMake Nightly Date Stamp 2020-02-21 00:01:11 -05:00
Kyle Edwards
1f44c5ed65 Merge topic 'string-hex'
97b639d3f1 Help: Make note that file(READ ... HEX) produces lowercase letters
5395bf05eb string: Add new HEX sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4373
2020-02-20 11:51:51 -05:00
Kitware Robot
907ffbf52e CMake Nightly Date Stamp 2020-02-20 00:01:08 -05:00
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
fe564f3131 Merge topic 'update-kwsys' into release-3.17
ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4361
2020-02-18 11:49:00 -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
ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion
Backport KWSys commit `ea77593a1` (SystemTools: CopyFileIfDifferent: Fix
endless recursion, 2020-02-13) for the CMake 3.17 branch.

Fixes: #20347
2020-02-18 11:41:36 -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