mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,977 Commits 2 Branches 385 Tags
9d0042362007b11ba2ca6c57f677b310cbd77dc5
Commit Graph

52977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josef Angstenberger
9d00423620 Tests: Fix typos and spelling in comments 2021-05-07 17:00:13 +02:00
Josef Angstenberger
6dd719a4a5 Utilities: Fix typos and spelling in comments 2021-05-07 17:00:13 +02:00
Josef Angstenberger
eaa860162c Auxiliary: Fix typos and spelling in comments 2021-05-07 17:00:12 +02:00
Josef Angstenberger
4af7c3de5c codespell: Add configuration file 2021-05-07 17:00:12 +02:00
Brad King
e417d46046 Merge topic 'ci-cmake.org-help' 
a5a4b0b6ab gitlab-ci: add jobs to upload cmake.org/cmake/help/git-{master,stage} docs
354ae6fe2e gitlab-ci: add jobs to build cmake.org/cmake/help/git-{master,stage} docs
eb7cbb577e gitlab-ci: clarify name of rsync upload block for binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6103
 2021-05-07 10:49:02 -04:00
Brad King
a5a4b0b6ab gitlab-ci: add jobs to upload cmake.org/cmake/help/git-{master,stage} docs 2021-05-07 10:14:29 -04:00
Brad King
354ae6fe2e gitlab-ci: add jobs to build cmake.org/cmake/help/git-{master,stage} docs 2021-05-07 09:52:59 -04:00
Brad King
eb7cbb577e gitlab-ci: clarify name of rsync upload block for binaries 2021-05-07 09:52:59 -04:00
Brad King
eac20afe9a Merge topic 'ctest-clicolor' 
df0e50d756 CTest: Add env var CLICOLOR to disable color output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6076
 2021-05-07 09:15:37 -04:00
Brad King
7e0bec20a7 Merge topic 'FindProtobuf-grpc-plugin' 
f2a4b879b1 FindProtobuf: Add PLUGIN parameter to protobuf_generate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6068
 2021-05-07 09:14:43 -04:00
Brad King
fd7293f36d Merge topic 'Fujitsu-Fortran-Ninja' 
284d12a426 Fujitsu: Make explicit Fortran preprocessing under Ninja more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6080
 2021-05-07 09:13:51 -04:00
Brad King
41dc5c7cef Merge branch 'release-3.20' 2021-05-07 09:12:09 -04:00
Brad King
26751418a3 Merge topic 'improve_cuda_toolkit_extraction_regex' 
5e931c5a97 CUDA: improve regex for CUDA Toolkit root from nvcc verbose output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6094
 2021-05-07 09:12:08 -04:00
Brad King
fdbb5a599f Merge topic 'improve_cuda_toolkit_extraction_regex' into release-3.20 
5e931c5a97 CUDA: improve regex for CUDA Toolkit root from nvcc verbose output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6094
 2021-05-07 09:12:08 -04:00
Kitware Robot
f0ecd91301 CMake Nightly Date Stamp 2021-05-07 00:01:11 -04:00
Frank Lange
f2a4b879b1 FindProtobuf: Add PLUGIN parameter to protobuf_generate 
This allows for example reusing the function for generating gRPC code by
specifying which grpc plugin to use.
 2021-05-06 13:42:21 -04:00
Eisuke Kawashima
284d12a426 Fujitsu: Make explicit Fortran preprocessing under Ninja more robust 
Tell the Fortran compiler to write preprocessor output directly to a
file, as we do for the GNU compiler.  The previous "redirect stdout"
approach could break checks using flags that add information to stdout
when called with `-###`.

Fixes: #22156
 2021-05-06 13:11:48 -04:00
Brad King
5cbbe3d301 Merge topic 'update-kwsys' 
4141866dfe Merge branch 'upstream-KWSys' into update-kwsys
760bdfb26e KWSys 2021-05-06 (2fa93cfc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6095
 2021-05-06 12:10:31 -04:00
Robert Maynard
5e931c5a97 CUDA: improve regex for CUDA Toolkit root from nvcc verbose output 
The original regular expression was greedy and would match any
environment variable ending with `TOP` (like `DESKTOP`). This is an
issue on windows where `nvcc -v` would output all environment variables
before the compiler's verbose output.

To resolve this issue we use a tighter match algorithm that looks
for `#$ TOP=` instead of `TOP=`.

Fixes: #22158
 2021-05-06 12:08:24 -04:00
Brad King
4141866dfe Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-06 (2fa93cfc)
 2021-05-06 11:53:18 -04:00
KWSys Upstream
760bdfb26e KWSys 2021-05-06 (2fa93cfc) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 2fa93cfca6291e8eaffa2a34d2d7908c93e64a6c (master).

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

Brad King (1):
      5c6539ca Terminal: Revert "Simplify CLICOLOR_FORCE check"
 2021-05-06 11:53:17 -04:00
Martin Willers
df0e50d756 CTest: Add env var CLICOLOR to disable color output 
Based on the implementation in Terminal.c:kwsysTerminalStreamIsVT100.
 2021-05-06 11:40:40 -04:00
Brad King
e0b4a22ca6 Merge topic 'nmake-utf8' 
f3f57cc4ed NMake: Use UTF-8 with BOM if supported by nmake
186c9bff53 NMake: Check nmake version for support of UTF-8
8a4f536be6 NMake: Detect nmake version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6041
 2021-05-06 10:13:11 -04:00
Brad King
6785df1b06 Merge topic 'ci-continuous-help' 
71665c8cb9 gitlab-ci: Clarify conditions enabling jobs for continuous build of stage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6091
 2021-05-06 10:12:19 -04:00
Brad King
1f795ee40e Merge topic 'update-kwsys' 
4b73f113ba Merge branch 'upstream-KWSys' into update-kwsys
04c6e736f6 KWSys 2021-05-05 (e9ca4104)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6088
 2021-05-06 10:11:33 -04:00
Brad King
f062f8b1fd Merge topic 'objc-osx-architectures' into release-3.20 
5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6090
 2021-05-06 10:10:18 -04:00
Brad King
cc4d6d2085 Merge branch 'release-3.20' 2021-05-06 10:10:18 -04:00
Brad King
50225fb306 Merge topic 'objc-osx-architectures' 
5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6090
 2021-05-06 10:10:18 -04:00
Brad King
0197012831 Merge topic 'preset-test-example' 
fa16b462f1 Tests: Fix RunCMake.CMakePresets example PATH format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6087
 2021-05-06 10:08:51 -04:00
Kitware Robot
4cab7a6fc5 CMake Nightly Date Stamp 2021-05-06 00:01:10 -04:00
Brad King
71665c8cb9 gitlab-ci: Clarify conditions enabling jobs for continuous build of stage 2021-05-05 15:25:35 -04:00
Amine Najahi
f3f57cc4ed NMake: Use UTF-8 with BOM if supported by nmake 
Fixes: #21792
 2021-05-05 10:56:49 -04:00
Brad King
186c9bff53 NMake: Check nmake version for support of UTF-8 
NMake version 9 and above support UTF-8 encoded makefiles with a BOM.
 2021-05-05 10:56:49 -04:00
Brad King
8a4f536be6 NMake: Detect nmake version 
Run `nmake -?` and extract the version from its output.
Use a timeout because Watcom tools come with a `nmake` tool
that always waits for user input on `-?`.
 2021-05-05 10:55:55 -04:00
Brad King
5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC 
Fix a typo from commit 940fc62962 (macOS: Respect OSX_ARCHITECTURES for
ASM, 2020-08-21, v3.19.0-rc1~270^2).

Fixes: #22152
 2021-05-05 10:45:01 -04:00
KWSys Upstream
04c6e736f6 KWSys 2021-05-05 (e9ca4104) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit e9ca4104e816c28e3fcf94ce69fd75ca9498f4a7 (master).

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

Ben Boeckel (1):
      99ffa991 cmake: clear some configure checks when the deployment target changes

Martin Willers (2):
      bbf6cdef Terminal: Simplify CLICOLOR_FORCE check
      f308fcfb Terminal: Disable color output when CLICOLOR is set to 0
 2021-05-05 10:17:30 -04:00
Brad King
4b73f113ba Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-05 (e9ca4104)
 2021-05-05 10:17:30 -04:00
Brad King
fa16b462f1 Tests: Fix RunCMake.CMakePresets example PATH format 
Since commit 94c955e508 (Tests: Test the CMakePresets.json example in
the documentation, 2020-10-09, v3.19.0-rc1~8^2) we transform the
documented preset example for testing by replacing the generator.
Extend the transformation with a step to fix `PATH` env var syntax.
 2021-05-05 10:13:35 -04:00
Brad King
41f9486e61 Merge topic 'generate-cmake-build-command-parallel' 
d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument
fc2ac46043 build_command: Add the PARALLEL_LEVEL argument
4dd4e9dd6c cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6069
 2021-05-05 10:11:46 -04:00
Brad King
7973f97828 Merge topic 'doc-tls' 
7398993f5b Help: Document CMAKE_TLS_VERIFY variable explicitly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6064
 2021-05-05 10:08:45 -04:00
Brad King
06d103889c Merge topic 'clang-ipo-support' 
3dd776ccfd Windows-Clang: Support duplicate object names in LTO archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6082
 2021-05-05 10:07:26 -04:00
Brad King
2773173f90 Merge branch 'release-3.20' 2021-05-05 10:06:03 -04:00
Brad King
4ff6c5e34c Merge topic 'binutils-var-private' 
c33fb2e664 BinUtils: Use more-private temporary variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6085
 2021-05-05 10:06:03 -04:00
Brad King
084767a9ce Merge topic 'binutils-var-private' into release-3.20 
c33fb2e664 BinUtils: Use more-private temporary variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6085
 2021-05-05 10:06:02 -04:00
Kitware Robot
de0c8b4d98 CMake Nightly Date Stamp 2021-05-05 00:01:07 -04:00
friendlyanon
d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument 
Fixes: #19712
 2021-05-04 20:30:18 +02:00
friendlyanon
fc2ac46043 build_command: Add the PARALLEL_LEVEL argument 
Issue: #19712
 2021-05-04 20:17:17 +02:00
Brad King
c33fb2e664 BinUtils: Use more-private temporary variable names 
Since commit 4d786dfcfa (BinUtils: Avoid clobbering a variable named
without a private prefix, 2021-04-06, v3.20.1~4^2) we use variables
named `_tool` and `_name`, but these may still be common enough to
affect project code.  Use `_CMAKE_TOOL` and `_CMAKE_TOOL_NAME` instead,
and unset them when finished.

Fixes: #22140
 2021-05-04 12:44:14 -04:00
Brad King
d4529b7e6e Merge topic 'doc-review' 
b82052feb8 Help/dev/review: Clarify instructions to update existing merge requests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6073
 2021-05-04 12:31:57 -04:00
Michael Hirsch
7398993f5b Help: Document CMAKE_TLS_VERIFY variable explicitly 
Previously it was mentioned only in the `file` and `ExternalProject`
documentation.
 2021-05-04 12:29:13 -04:00