mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-04 13:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,702 Commits 2 Branches 392 Tags
d93ce24b0fc84b0cc147ca2e22db9356c2273bcf
Commit Graph

28684 Commits

Author SHA1 Message Date
Kitware Robot
c63fb217c0 CMake Nightly Date Stamp 2020-04-15 00:01:08 -04:00
Brad King
734238d64f Merge topic 'sort_list_natural_20563' 
da99eca1e7 list: add NATURAL sorting on SORT sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4602
 2020-04-14 09:45:55 -04:00
Brad King
b54d80b293 Merge topic 'cmake-gui-system-processor' 
11cbf79d15 cmake-gui: Pass CMAKE_SYSTEM_PROCESSOR to from gui to cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4604
 2020-04-14 09:43:34 -04:00
Brad King
1ee921531c Merge topic 'clang-tidy-9.0-changes' 
7cb72fadc8 cmConfigureFileCommand: simplify no-op argument handling
f413727d27 clang-tidy: address bugprone-sizeof-expression lint
609c3b7cdc cmComputeLinkInformation: reserve space in built-up string
89207abf1f cmParseCacheCoverage: use cmSystemTools::SplitString
59b7adddc4 nits: replace some "c" instances with 'c'
80edc2cd8a cmMakefile: use std::string_view
37872088cf clang-tidy: address readability-else-after-return lint
f2a33107be clang-tidy: address bugprone-branch-clone lints
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4584
 2020-04-14 09:42:17 -04:00
Kitware Robot
deba768e14 CMake Nightly Date Stamp 2020-04-14 00:01:11 -04:00
Johnny Jazeix
da99eca1e7 list: add NATURAL sorting on SORT sub-command 
Fixes: #20563
 2020-04-13 18:26:28 +02:00
Ben Boeckel
7cb72fadc8 cmConfigureFileCommand: simplify no-op argument handling 2020-04-13 11:26:03 -04:00
Ben Boeckel
f413727d27 clang-tidy: address bugprone-sizeof-expression lint 2020-04-13 11:26:03 -04:00
Ben Boeckel
609c3b7cdc cmComputeLinkInformation: reserve space in built-up string 
This should avoid any reallocations that would occur in this function.
 2020-04-13 11:26:03 -04:00
Ben Boeckel
89207abf1f cmParseCacheCoverage: use cmSystemTools::SplitString 2020-04-13 11:26:03 -04:00
Ben Boeckel
59b7adddc4 nits: replace some "c" instances with 'c' 2020-04-13 11:26:03 -04:00
Ben Boeckel
80edc2cd8a cmMakefile: use std::string_view 2020-04-13 11:26:03 -04:00
Ben Boeckel
f2a33107be clang-tidy: address bugprone-branch-clone lints 
Arguably, many of these are bugs in `clang-tidy`. An if/else tree with
other conditionals between cloned blocks may be relying on the
intermediate logic to fall out of the case and inverting this logic may
be non-trivial.

See: https://bugs.llvm.org/show_bug.cgi?id=44165
 2020-04-13 11:26:02 -04:00
Jiri Malak
11cbf79d15 cmake-gui: Pass CMAKE_SYSTEM_PROCESSOR to from gui to cmake 
Add missing `CMAKE_SYSTEM_PROCESSOR` cmake cache entry to passed options
for first configure.  We already pass `CMAKE_SYSTEM_{NAME,VERSION}`.
 2020-04-13 11:17:10 -04:00
Brad King
eb28858586 Merge topic 'include-dir-special' 
9be48c4d0b Tests: Add coverage for special characters in include directories
dc0dc974a9 Xcode: Fix quoting of paths with square brackets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4591
 2020-04-13 11:01:03 -04:00
Brad King
140c11e8d0 Merge topic 'update-kwsys' 
0b495b6ca9 Merge branch 'upstream-KWSys' into update-kwsys
4ab6fcd676 KWSys 2020-04-10 (b62956f5)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4594
 2020-04-13 10:47:55 -04:00
Brad King
b30e5fd972 Merge topic 'clang_cuda_prep' 
d86fcc6359 CUDAToolkit: Deduce toolkit binary directory from compiler path only for NVCC
87e98bf8be CUDA: Forward CMAKE_CUDA_COMPILER_TARGET in try_compile()
60e60b9201 GNU: Disable depfiles in try-compile mode only for GCC
5f02add366 CUDA: Refactor PTX compilation flag into compiler modules
25439c7d62 Clang: Refactor CXX standard flags into __compiler_clang_cxx_standards()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4567
 2020-04-13 10:46:12 -04:00
Kitware Robot
e42389c83f CMake Nightly Date Stamp 2020-04-13 00:01:13 -04:00
Kitware Robot
26e4d9345c CMake Nightly Date Stamp 2020-04-12 00:01:10 -04:00
Kitware Robot
120eb23104 CMake Nightly Date Stamp 2020-04-11 00:01:11 -04:00
Brad King
bf120819c4 Merge topic 'find_program-exe-no-read' 
86e6349ef7 find_program: Find programs that are executable but not readable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4571
 2020-04-10 09:49:50 -04:00
Brad King
9ef0f35670 Merge topic 'ccmake-better-string-ops' 
603a532b58 cmCursesLongMessageForm: avoid unnecessary string allocation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sylvain Joubert <joubert.sy@gmail.com>
Merge-request: !4590
 2020-04-10 09:48:41 -04:00
Brad King
dc0dc974a9 Xcode: Fix quoting of paths with square brackets 
The Xcode project file format needs paths containing square
brackets ('[' or ']') to be quoted.

Issue: #20555
 2020-04-10 09:37:18 -04:00
Brad King
0b495b6ca9 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-10 (b62956f5)
 2020-04-10 07:56:14 -04:00
Kitware Robot
41c0adde02 CMake Nightly Date Stamp 2020-04-10 00:01:10 -04:00
Ben Boeckel
603a532b58 cmCursesLongMessageForm: avoid unnecessary string allocation 
The addition makes a temporary string and then drops it after adding it
to `this->Messages`. Instead, just incrementally append.
 2020-04-09 11:04:45 -04:00
Brad King
9532929216 Merge topic 'file-upload-tls' 
bf94dcba76 file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4580
 2020-04-09 08:31:19 -04:00
Brad King
0e1313cdf4 Merge topic 'ccmake_incremental_log_display' 
60bfaa8fe6 ccmake: Use incremental rendering for the logs
e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4573
 2020-04-09 08:12:12 -04:00
Brad King
73d358442c Merge topic 'apple-arch-sysroots' 
da25220d83 Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots
84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES
45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4583
 2020-04-09 08:10:55 -04:00
Vladimir Menshakov
86e6349ef7 find_program: Find programs that are executable but not readable 
`find_program` internally uses `cmSystemTools::FileExists`
which calls `access(R_OK)` instead of `access(X_OK)`.
Use `cmSystemTools::IsFileExecutable` instead to fix this
issue.  An example of such a program is `sudo`.

Fixes: #10468
 2020-04-09 08:08:50 -04:00
Brad King
5abe64246d Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-09 (e798e567)
 2020-04-09 07:34:08 -04:00
Kitware Robot
5a62d86f8b CMake Nightly Date Stamp 2020-04-09 00:01:12 -04:00
Sylvain Joubert
60bfaa8fe6 ccmake: Use incremental rendering for the logs 
This should avoid an exponential slowdown in the display time for
projects with lots of output.
This is still slower than cmake due to the ncurses drawing, but it should
now be O(L) in total and not O(L^2) wrt to output length.

Fixes: #20535
 2020-04-08 14:40:09 -04:00
Brad King
e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form 2020-04-08 14:39:46 -04:00
Brad King
da25220d83 Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots 2020-04-08 13:44:42 -04:00
Brad King
84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES 
The `CMAKE_OSX_ARCHITECTURES` value is not used directly by generators.
It is used to initialize a per-target `OSX_ARCHITECTURES` property, but
that property can also be set explicitly by project code to a subset of
the full list of architectures.  In order to handle this case, construct
a mapping from each `CMAKE_OSX_ARCHITECTURES` entry to the corresponding
`CMAKE_APPLE_ARCH_SYSROOTS` entry by name.  Use the mapping to find the
sysroot for each entry in `OSX_ARCHITECTURES` for a given target.

If `CMAKE_APPLE_ARCH_SYSROOTS` does not have the same length as
`CMAKE_OSX_ARCHITECTURES`, error out early rather than risking a crash
or assertion failure.

Fixes: #20534
 2020-04-08 13:40:09 -04:00
Brad King
45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS 
Use `<arch>-SDK-NOTFOUND` instead of an empty string as a placeholder in
`CMAKE_APPLE_ARCH_SYSROOTS` for architectures whose SDK is not found.
This ensures the length of `CMAKE_APPLE_ARCH_SYSROOTS` matches the
length of `CMAKE_OSX_ARCHITECTURES`.  It also makes the missing SDKs
more visible in the value.

Issue: #20534
 2020-04-08 11:51:02 -04:00
Harry Mallon
bf94dcba76 file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO 
* Improve and test err messages when TLS_VERIFY and TLS_CAINFO
  are not set in file(DOWNLOAD) and file(UPLOAD).
 2020-04-08 15:15:49 +01:00
Brad King
77053ed470 Merge topic 'ninja-order-depends' 
d54f0aa9b7 Merge branch 'master' into ninja-order-depends
2f949be4b3 Ninja: Make config uppercase in object order target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4581
 2020-04-08 09:03:23 -04:00
Brad King
e8295e532b Merge topic 'file-upload-tls' 
9427763081 file(UPLOAD): Add default ca_certs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4579
 2020-04-08 08:51:11 -04:00
Brad King
d5e44d7a38 Merge topic 'update-kwsys' 
ff2e597ba2 Merge branch 'upstream-KWSys' into update-kwsys
c5635588ad KWSys 2020-04-07 (caff9c3b)
2cc7baa1bc Tests: Fix get_filename_component PROGRAM test to use an executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4578
 2020-04-08 08:48:56 -04:00
Kitware Robot
09d28262bf CMake Nightly Date Stamp 2020-04-08 00:01:12 -04:00
Kyle Edwards
d54f0aa9b7 Merge branch 'master' into ninja-order-depends 2020-04-07 14:54:54 -04:00
Kyle Edwards
2f949be4b3 Ninja: Make config uppercase in object order target 
Fixes: #20539
 2020-04-07 14:28:35 -04:00
Harry Mallon
9427763081 file(UPLOAD): Add default ca_certs 
Default ca_certs were not added when using `UPLOAD` with built-in
(non-system) cURL.  Previously we only did this for `DOWNLOAD`.

Fixes: #20551
 2020-04-07 12:58:04 -04:00
Brad King
ff2e597ba2 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-07 (caff9c3b)
 2020-04-07 10:31:10 -04:00
Raul Tambre
87e98bf8be CUDA: Forward CMAKE_CUDA_COMPILER_TARGET in try_compile() 
Required for crosscompile support with Clang.
 2020-04-07 09:33:26 -04:00
Brad King
b8b804e2ed Merge topic 'file-GetRuntimeDependencies_support_cross_compilation' 
f867423aa2 file: GetRuntimeDependencies use CMAKE_OBJDUMP when applicable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4538
 2020-04-07 08:03:50 -04:00
Brad King
c0438d272d Merge topic 'llvm-rc-include-path' 
35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4570
 2020-04-07 08:00:45 -04:00
Brad King
3d61ff7b10 Merge topic 'llvm-rc-include-path' into release-3.17 
35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4570
 2020-04-07 08:00:44 -04:00