mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-05 04:03:22 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zack Galbreath 2a71a0390c ctest: rename TRACK to GROUP 
Update command-line options, script variables, and documentation to use
the term "group" instead of "track". The old terms are still available
for now, but they are now undocumented.

This makes our terminology more consistent with CDash. The goal of this
change is to make it more clear to our users how CTest and CDash interact
with each other.
 2019-08-22 13:10:18 -04:00
Brad King a7aade8419 cmGlobalVisualStudioGenerator: Fix buffer sizes used with RegEnumKeyExW 
In commit 0b9906c2fb (Windows: Use wide-character system APIs,
2013-12-04, v3.0.0-rc1~254^2) several buffer size computations had to be
updated to multiply by `sizeof(wchar_t)`, but for RegEnumKeyExW we were
already computing the correct number of characters with a division which
was accidentally converted to a multiplication.  Use `cm::size` to
compute the number of characters in the buffer instead.

Issue: #19610
 2019-08-22 13:06:15 -04:00
Brad King d911f8fc12 Merge branch 'CrayPrgEnv-update-link-type-detection' into release-3.15 
Merge-request: !3716
 2019-08-22 12:27:08 -04:00
Chuck Atkins 971c778213 CrayPrgEnv: Change default linking mode based on PE version 
Beginning with the 19.06 release of the Cray Programming Environment, the
default linking mode on XC Cray systems is dynamic instead of static.
This updates the CrayPrgEnv compiler wrappers to detect the PE version
being used and behave accordingly.
 2019-08-22 12:26:06 -04:00
Brad King f6211f57d6 cmGlobalVisualStudioGenerator: Fix buffer sizes used RegQueryValueExW 
In commit 0b9906c2fb (Windows: Use wide-character system APIs,
2013-12-04, v3.0.0-rc1~254^2) several buffer size computations had to be
updated to multiply by `sizeof(wchar_t)`, but some for RegQueryValueExW
were incorrect because the number of bytes was already computed.

Issue: #19610
 2019-08-22 11:01:50 -04:00
Sebastian Holtermann 9b334397f5 Source sweep: Use cmStrCat for string concatenation 
This patch is generated by a python script that uses regular expressions to
search for string concatenation patterns of the kind

```
std::string str = <ARG0>;
str += <ARG1>;
str += <ARG2>;
...
```

and replaces them with a single `cmStrCat` call

```
std::string str = cmStrCat(<ARG0>, <ARG1>, <ARG2>, ...);
```

If any `<ARGX>` is itself a concatenated string of the kind

```
a + b + c + ...;
```

then `<ARGX>` is split into multiple arguments for the `cmStrCat` call.

If there's a sequence of literals in the `<ARGX>`, then all literals in the
sequence are concatenated and merged into a single literal argument for
the `cmStrCat` call.

Single character strings are converted to single char arguments for
the `cmStrCat` call.

`std::to_string(...)` wrappings are removed from `cmStrCat` arguments,
because it supports numeric types as well as string types.

`arg.substr(x)` arguments to `cmStrCat` are replaced with
`cm::string_view(arg).substr(x)`
 2019-08-22 16:38:10 +02:00
Brad King 130dbe4a5d Merge topic 'cmCommand_refactor' 
6ab28b9413 cmCommand refactor: cmStringCommand
36f32d3604 cmCommand refactor: cmSetPropertyCommand
7c83c19205 cmCommand refactor: cmSetDirectoryPropertiesCommand
9413952c42 cmCommand refactor: cmCMakePolicyCommand
07ea93de54 cmCommand refactor: cmWriteFileCommand
ca3b9186bb cmCommand refactor: cmVariableWatchCommand
b1acc711f4 cmCommand refactor: cmRemoveCommand
413a960391 cmCommand refactor: cmCMakeHostSystemInformationCommand
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3673
 2019-08-22 10:25:09 -04:00
Brad King 337be1507d Merge topic 'isolate-declarations' 
d331021255 clang-tidy: isolate declarations for readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3704
 2019-08-22 10:23:34 -04:00
Brad King 6e1ff50efb Merge topic 'FindBoost-clarify-header-only' 
0148f1a867 FindBoost: Add note about header-only libs in warning msg

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3712
 2019-08-22 10:16:10 -04:00
Kitware Robot 7ddb5adc40 CMake Nightly Date Stamp 2019-08-22 00:01:08 -04:00
Brad King bce0d4c27d Merge topic 'FindBZip2-windows-lib-names' 
5edceff308 FindBZip2: Add Windows library names emitted from bzip2 1.0.6 makefile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3711
 2019-08-21 12:01:32 -04:00
Braden McDaniel 5edceff308 FindBZip2: Add Windows library names emitted from bzip2 1.0.6 makefile 
As of release 1.0.6, the bzip2 distribution includs a makefile for nmake
on Windows that emits library names of the form `libbz2.lib`.
 2019-08-21 12:00:11 -04:00
Brad King 28ef108140 Merge topic 'source_group-tests' 
bb6e95ca6d source_group: Improved generated filters tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3675
 2019-08-21 11:59:38 -04:00
Brad King b6412b38ee Merge topic 'double-export-error-message-install' 
d17580909f cmExportInstallFileGenerator: improve error message
a18100898a cmInstallExportGenerator: add a method for the file destination

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3703
 2019-08-21 11:58:27 -04:00
Brad King dfb5936f0f Merge topic 'shared-string' 
be7807478c cmDefinitions: Reduce allocation of keys and values in MakeClosure
e07e2bc8bb bootstrap: Compile cm::String
c1787cb5eb cpack.cxx: Re-order include blocks to follow our conventions
141e307484 cmConfigure.h: Tell windows.h not to define min/max macros

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3669
 2019-08-21 11:57:05 -04:00
Brad King ea4c3976fb Merge topic 'install-fail-reason' 
891e670e59 install: print reason of failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !3696
 2019-08-21 11:55:58 -04:00
Brad King bd3f088abe Merge topic 'ccmake-find-system-form-header' 
66654135c1 ccmake: Fix form.h include with CMAKE_USE_SYSTEM_FORM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3683
 2019-08-21 11:54:48 -04:00
Brad King 3402e6cf82 Merge topic 'vs-sln-bom' 
3b51343ea1 VS: Emit UTF-8 BOM for generated solution files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3705
 2019-08-21 11:53:23 -04:00
Brad King bfe0ea2d98 Merge topic 'cm-contains' 
2dfc52675c cmAlgorithms: Add cmContains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !3700
 2019-08-21 11:52:06 -04:00
Brad King 2ad09c5ddd Merge topic 'ProcessorCount-solaris' 
1c87bc60ee ProcessorCount: Fix virtual processor count on Solaris

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3694
 2019-08-21 10:51:48 -04:00
Brad King e15a9187b0 Merge topic 'FindCUDA-nvcc-include-dir-backslash' 
76b76a7f9b FindCUDA: Fix support for backslashes in CUDA_NVCC_INCLUDE_DIRS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3679
 2019-08-21 10:49:50 -04:00
Brad King de2c73d84f Merge topic 'free-disallowed' 
c55fb044a9 cmBuildNameCommand: Implement as free function
86bf1eef75 cmState: Support free function disallowed commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3688
 2019-08-21 10:47:47 -04:00
Brad King 98972371e4 Merge branch 'release-3.15' 2019-08-21 10:41:45 -04:00
Brad King 01c7c4236a Merge topic 'FindMPI-restore-flag-vars' 
31b8b28fed FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3710
 2019-08-21 10:28:33 -04:00
Brad King 9182b3ce53 Merge branch 'FindMPI-restore-flag-vars' into release-3.15 
Merge-request: !3710
 2019-08-21 10:10:52 -04:00
Robert Maynard 31b8b28fed FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONS 
In commit e374b9f1eb (FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a
command-line string, 2018-09-10, v3.12.3~6^2) we tried to restore the
compile flags but accidentally inverted the arguments to `list(JOIN)`
causing both `MPI_<LANG>_COMPILE_FLAGS` and `MPI_<LANG>_COMPILE_OPTIONS`
to be empty.

Issue: #18349
 2019-08-21 10:08:12 -04:00
Jon Chronopoulos 3bb7453436 GetPrerequisites: match ldd output on Solaris 
Solaris output is the following:

```
$ ldd /lib/libxml2.so
libz.so.1 =>     /lib/libz.so.1
libm.so.2 =>     /lib/libm.so.2
libc.so.1 =>     /lib/libc.so.1
```

While on Linux

```
$ ldd /usr/lib/libxml2.so
linux-vdso.so.1 (0x00007ffe02bbe000)
libdl.so.2 => /usr/lib/libdl.so.2 (0x00007f03ab852000)
libicuuc.so.64 => /usr/lib/libicuuc.so.64 (0x00007f03ab67a000)
libz.so.1 => /usr/lib/libz.so.1 (0x00007f03ab463000)
liblzma.so.5 => /usr/lib/liblzma.so.5 (0x00007f03ab23d000)
libm.so.6 => /usr/lib/libm.so.6 (0x00007f03ab0f7000)
libc.so.6 => /usr/lib/libc.so.6 (0x00007f03aaf34000)
/usr/lib64/ld-linux-x86-64.so.2 (0x00007f03ab9fd000)
libicudata.so.64 => /usr/lib/libicudata.so.64 (0x00007f03a94ee000)
libpthread.so.0 => /usr/lib/libpthread.so.0 (0x00007f03a94cd000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007f03a92e5000)
libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007f03a92cb000)
```
 2019-08-21 17:25:28 +10:00
Kitware Robot a04b852a7b CMake Nightly Date Stamp 2019-08-21 00:01:08 -04:00
Dennis Klein 0148f1a867 FindBoost: Add note about header-only libs in warning msg 2019-08-21 01:55:47 +02:00
Regina Pfeifer d331021255 clang-tidy: isolate declarations for readability 2019-08-21 00:20:49 +02:00
Gabor Bencze 6ab28b9413 cmCommand refactor: cmStringCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 36f32d3604 cmCommand refactor: cmSetPropertyCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 7c83c19205 cmCommand refactor: cmSetDirectoryPropertiesCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 9413952c42 cmCommand refactor: cmCMakePolicyCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 07ea93de54 cmCommand refactor: cmWriteFileCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze ca3b9186bb cmCommand refactor: cmVariableWatchCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze b1acc711f4 cmCommand refactor: cmRemoveCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 413a960391 cmCommand refactor: cmCMakeHostSystemInformationCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze c33c52bb32 cmCommand refactor: cmUnsetCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze b316d0d417 cmCommand refactor: cmSiteNameCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze b3aa789630 cmCommand refactor: cmSetCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 2a9299782e cmCommand refactor: cmSeparateArgumentsCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze d780822da6 cmCommand refactor: cmParseArgumentsCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 4fa9630b7e cmCommand refactor: cmOptionCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze cfc7854ef0 cmCommand refactor: CmMessageCommand 2019-08-20 14:42:20 -04:00
Gabor Bencze 71724633a2 cmCommand refactor: cmMathCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze 2b58ae7577 cmCommand refactor: cmMarkAsAdvancedCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze 5b40a872dd cmCommand refactor: cmMakeDirectoryCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze e0b7ff4af2 cmCommand refactor: cmListCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze 9ae9f3e77e cmCommand refactor: cmMacroCommand 2019-08-20 14:42:19 -04:00