mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 15:18:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,713 Commits 2 Branches 392 Tags
d199ab7af072aebc44a33b58deebd3b1d0ca3f4b
Commit Graph

47713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
d199ab7af0 Merge branch 'release-3.17' 2020-04-15 09:39:56 -04:00
Brad King
45d61f9f89 Merge topic 'ibmi-aix-exports' 
420e91c951 AIX: Activate symbol export/import IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4611
 2020-04-15 09:39:56 -04:00
Brad King
e4aed8b9cd Merge topic 'ibmi-aix-exports' into release-3.17 
420e91c951 AIX: Activate symbol export/import IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4611
 2020-04-15 09:39:55 -04:00
Brad King
8123f6b199 Merge branch 'release-3.17' 2020-04-15 09:38:04 -04:00
Brad King
5fde1af854 Merge topic 'FindPython-if-auto-deref' into release-3.17 
894fdea2a9 FindPython: remove extra dereference
0b9c9e2c8c FindPython: avoid autoderef in version comparisons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4610
 2020-04-15 09:38:03 -04:00
Brad King
d561898572 Merge topic 'FindPython-if-auto-deref' 
894fdea2a9 FindPython: remove extra dereference
0b9c9e2c8c FindPython: avoid autoderef in version comparisons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4610
 2020-04-15 09:38:03 -04:00
Brad King
642bd67fc5 Merge branch 'release-3.17' 2020-04-15 09:36:25 -04:00
Brad King
d93ce24b0f Merge topic 'FindCUDAToolkit-search-stubs' 
4f1e24efa0 FindCUDAToolkit searches stub location last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4589
 2020-04-15 09:36:25 -04:00
Brad King
17e6666a43 Merge topic 'FindCUDAToolkit-search-stubs' into release-3.17 
4f1e24efa0 FindCUDAToolkit searches stub location last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4589
 2020-04-15 09:36:24 -04:00
Brad King
71a0609379 Merge branch 'release-3.17' 2020-04-15 09:01:36 -04:00
Brad King
40e043eb98 Merge branch 'backport-3.17-file-upload-tls' into release-3.17 
Merge-request: !4579
 2020-04-15 08:57:13 -04:00
Harry Mallon
dbfece1004 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-15 08:55:09 -04:00
Kitware Robot
c63fb217c0 CMake Nightly Date Stamp 2020-04-15 00:01:08 -04:00
Brad King
420e91c951 AIX: Activate symbol export/import IBM i (OS400) 
Fixes: #20582
 2020-04-14 14:45:51 -04:00
Ben Boeckel
894fdea2a9 FindPython: remove extra dereference 
If the version is not found (e.g., missing headers), this causes a CMake
error about `if(blah VERSION_EQUAL)` being an invalid statement.
 2020-04-14 11:03:35 -04:00
Ben Boeckel
0b9c9e2c8c FindPython: avoid autoderef in version comparisons 2020-04-14 11:03:35 -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
Robert Maynard
4f1e24efa0 FindCUDAToolkit searches stub location last 
Fixes #20252
 2020-04-14 09:39:46 -04:00
Brad King
ce9777c62f Merge topic 'UseJava-quoting' 
01d5b888a3 UseJava: Quote -classpath argument correctly on more platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !4597
 2020-04-14 09:39:37 -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
37872088cf clang-tidy: address readability-else-after-return lint 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
Ben Boeckel
4e9e7c713e clang-tidy: ignore making members static 
CMake has lots of instances of this which is outside the scope of this
topic right now.
 2020-04-13 11:26:02 -04:00
Ben Boeckel
b108c9fdaf TestDriver: avoid clang-tidy lints in generated code 2020-04-13 11:26:02 -04:00
Ben Boeckel
77a1e80380 clang-tidy: ignore the use-trailing-return-type lint 
CMake isn't ready for this yet.
 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
da586cf190 Merge branch 'release-3.17' 2020-04-13 10:57:23 -04:00
Brad King
adc58e9612 Merge topic 'FindMPI-pgi-spectrum-mpi-wrappers' 
cd449c6175 FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4598
 2020-04-13 10:57:23 -04:00
Brad King
e14386db8f Merge topic 'FindMPI-pgi-spectrum-mpi-wrappers' into release-3.17 
cd449c6175 FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4598
 2020-04-13 10:57:22 -04:00
Brad King
32aba2e7ee Merge branch 'release-3.17' 2020-04-13 10:55:50 -04:00
Brad King
d3fa00a14b Merge branch 'release-3.16' into release-3.17 2020-04-13 10:54:25 -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
Marc Chevrier
9446ec7a2b Merge topic 'FindPython-help-updates' 
525c730afe Help: FindPython: fix typos and add some clarifications

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4599
 2020-04-12 08:30:25 -04:00
Kitware Robot
26e4d9345c CMake Nightly Date Stamp 2020-04-12 00:01:10 -04:00
Craig Scott
baff868b41 Merge topic 'docs-CMAKE_CURRENT_FUNCTION' into release-3.17 
10ee9611f0 Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docs
22fbc404a7 Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docs
d2b139687a Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !4595
 2020-04-11 09:12:29 -04:00
Craig Scott
b7e4f80298 Merge branch 'release-3.17' 2020-04-11 09:12:29 -04:00
Craig Scott
75e45f50e5 Merge topic 'docs-CMAKE_CURRENT_FUNCTION' 
10ee9611f0 Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docs
22fbc404a7 Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docs
d2b139687a Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !4595
 2020-04-11 09:12:29 -04:00
Craig Scott
f0b213e291 Merge topic 'docs-SKIP_PRECOMPILE_HEADERS-formatting' into release-3.17 
a293d05c41 Help: Fix unescaped asterisks in docs for SKIP_PRECOMPILE_HEADERS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4592
 2020-04-11 09:10:33 -04:00