44831 Commits

Author SHA1 Message Date
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
Gabor Bencze
ceab7bda44 cmCommand refactor: cmIncludeGuardCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
f42dad7a5e cmCommand refactor: cmIncludeCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
fb57537a83 cmCommand_refactor: cmGetPropertyCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
6377efd154 cmCommand refactor: cmGetFilenameComponentCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
067d1fa9c0 cmCommand refactor: cmGetDirectoryPropertyCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
40ba0addac cmCommand refactor: cmGetCMakePropertyCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
9bbe95a0e7 cmCommand refactor: cmFunctionCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
cce3600e3f cmCommand refactor: cmForEachCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
3e5eb45ec1 cmCommand refactor: cmExecuteProcessCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
0d87f5d83e cmCommand refactor: cmExecProgramCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
0005e17d50 cmCommand refactor: cmContinueCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
01949a02df cmCommand refactor: cmConfigureFileCommand 2019-08-20 14:42:19 -04:00
Gabor Bencze
dc629b5d97 cmCommand refactor: cmCMakeMinimumRequired 2019-08-20 14:42:19 -04:00
Gabor Bencze
e6a27adf9f cmCommand refactor: cmBreakCommand 2019-08-20 14:42:18 -04:00
Justin Goshi
3b51343ea1 VS: Emit UTF-8 BOM for generated solution files
We write UTF-8-encoded content to the `.sln` files, so tell VS to read
them as such.

Fixes: #19594
2019-08-20 11:09:31 -04:00
Christoph Grüninger
66654135c1 ccmake: Fix form.h include with CMAKE_USE_SYSTEM_FORM
Some distributions have form.h in ncurses/ next to the ncurses.h found
by FindCurses.

Fixes: #19589
2019-08-20 10:45:32 -04:00
Jon Chronopoulos
1c87bc60ee ProcessorCount: Fix virtual processor count on Solaris
The previous code did not count the number of virtual processors across
physical processors on SunOS.

Can handle the following situations:

```
$ uname -a
SunOS solaris 5.11 11.4.0.15.0 i86pc i386 i86pc
$ psrinfo -p -v
The physical processor has 1 virtual processor (0)
  x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz)
        Intel Core Processor (Broadwell)
The physical processor has 1 virtual processor (1)
  x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz)
        Intel Core Processor (Broadwell)
The physical processor has 1 virtual processor (2)
  x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz)
        Intel Core Processor (Broadwell)
The physical processor has 1 virtual processor (3)
  x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz)
        Intel Core Processor (Broadwell)
```

```
$ uname -a
SunOS sol11x86 5.11 11.0 i86pc i386 i86pc
$ psrinfo -p -v
The physical processor has 2 virtual processors (0 1)
  x86 (GenuineIntel 50650 family 6 model 85 step 0 clock 2000 MHz)
        Intel(r) Xeon(r) Gold 6138 CPU @ 2.00GHz
```

```
$ uname -a
SunOS sol11 5.11 11.0 sun4v sparc sun4v
$ psrinfo -p -v
The physical processor has 2 cores and 16 virtual processors (0-15)
  The core has 8 virtual processors (0-7)
  The core has 8 virtual processors (8-15)
    SPARC-T4 (chipid 0, clock 2848 MHz)
```
2019-08-20 10:26:06 -04:00
Brad King
43fe736b2b Merge topic 'bash-completion-silent-D-lookup'
64aeb520ca bash-completion: silent cmake -D lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3692
2019-08-20 10:18:20 -04:00
Ben Boeckel
d17580909f cmExportInstallFileGenerator: improve error message
Following commit 49cfd390 (cmExportBuildFileGenerator: improve error
message, 2019-06-26), improve the error message related to installed
export sets by referencing the files which contain the exported target
ambiguously.
2019-08-20 10:15:03 -04:00
Hong Xu
76b76a7f9b FindCUDA: Fix support for backslashes in CUDA_NVCC_INCLUDE_DIRS
Backslashes in `CUDA_NVCC_INCLUDE_DIRS` cause syntax errors because it
is written to a generated `.cmake` script as a string literal.  Use a
bracket argument to hold the expanded value as we already do for
`CUDA_NVCC_COMPILE_DEFINITIONS`.  Then explicitly convert backslashes to
forward slashes.
2019-08-20 09:47:29 -04:00