Commit Graph
47352 Commits
Author SHA1 Message Date
Willem Deconinck 08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references 2019-10-15 09:47:58 -04:00
Willem Deconinck cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized 2019-10-15 09:47:58 -04:00
Brad King fb16e0e7c0 Help: Clarify documentation of CMAKE_STATIC_LINKER_FLAGS
Issue: #19838
2019-10-15 09:43:00 -04:00
Kitware Robot daf6a6ba68 CMake Nightly Date Stamp 2019-10-15 00:01:05 -04:00
Brad King 7716be4561 Merge branch 'cmake-initial-cache-relative' into release-3.16
Merge-request: !3912
2019-10-14 16:18:16 -04:00
Brad King 74035b0ad4 Merge branch 'FindOpenMP-clang-HIP-device' into release-3.16
Merge-request: !3911
2019-10-14 16:18:08 -04:00
Peter Waller c9d73b26b0 cmake: Fix relative path regression in -C
Since commit 4ca0526f8a (cmake: Pass -S and -B into PreLoad.cmake and -C
scripts, 2019-08-20, v3.16.0-rc1~195^2) the value of `CMAKE_SOURCE_DIR`
is the source directory rather than the current working directory.
This was correct on its own, but the place storing that value is also
used as the base for relative paths specified on the command line.
The latter should of course be relative to the current working
directory.

The fix is to switch to use a full path internally, unless a full path
is already specified.  Add tests for the behaviour of `-C` under these
four circumstances:

    {with -S, without -S} x {full path, relative path}

Fixes: #19827
2019-10-14 16:17:00 -04:00
Kitware Robot 30f0319e7f CMake Nightly Date Stamp 2019-10-14 00:01:06 -04:00
Craig Scott 25eef45f16 Merge topic 'feature/CMAKE_MESSAGE_CONTEXT'
7cf79f4419 message: Support logging a context with each message
5bf85e2517 message: Add new CMAKE_MESSAGE_LOG_LEVEL variable
aa59badd6f Tests: Message log level tests must fail on unwanted output
7c579f0a03 Help: Move CMAKE_MESSAGE_INDENT variable to correct section
4b021bd3e9 message: Minor refactor to make code less verbose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3680
2019-10-13 17:08:44 -04:00
Kitware Robot 001a1d2686 CMake Nightly Date Stamp 2019-10-13 00:01:09 -04:00
Konstantin Pyzhov db5a8d7876 FindOpenMP: Add support for HIP clang device pass
The HIP clang makes 2 passes when compiling HIP programs: the DEVICE
pass and the HOST pass.  For openmp, the `-fopenmp` option is only
passed to the HOST compilation pass.  Therefore, the small test that
CMake uses for OpenMP detection fails to compile, and CMake reports
failure to detect OpenMP support in the compiler.  The suggested
solution is to add check for `__HIP_DEVICE_COMPILE__` macro defined by
HIP clang for the DEVICE pass to the OpenMP detection test.
2019-10-12 11:04:45 -04:00
Brad King 3008d6988c Merge branch 'release-3.16' 2019-10-12 10:30:48 -04:00
Brad King 07d15d70d2 Merge topic 'no-git-version'
874396a30d CMakeVersion: Add option to disable Git suffix
b254b0651e CMakeVersion: Prefer Git information provided by 'git archive' exports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3910
2019-10-12 10:29:19 -04:00
Brad King 0a52bada33 Merge topic 'FindPostgreSQL-macports-and-v12'
ec43d96657 FindPostgreSQL: support macports installation scheme
908dff41c6 FindPostgreSQL: support version 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3907
2019-10-12 10:28:05 -04:00
Brad King 3f10e564e0 Merge topic 'iar-8051-support'
5652e11ea1 IAR: Add 8051 support
6e51db9a40 IAR: Fix v850 assembler support file extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3906
2019-10-12 10:27:06 -04:00
Brad King 04ad7b8571 Merge topic 'objc-c++flags'
806e01d638 Objective-C: Do not treat Objective-C files as C++ files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3904
2019-10-12 10:26:13 -04:00
Brad King e13df96d26 Merge topic 'doc-unity-build'
13c8dbd5a6 Help: Document CMAKE_UNITY_BUILD/CMAKE_EXPORT_COMPILE_COMMANDS limitation
ed06d27c7f Help: Extend documentation of CMAKE_UNITY_BUILD variable
1d9155eb93 Help: Improve UNITY_BUILD documentation formatting
8aac65a361 Help: Document CMAKE_UNITY_BUILD in 3.16 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3905
2019-10-12 10:25:11 -04:00
Brad King 576424f89a Merge branch 'release-3.15' 2019-10-12 10:24:02 -04:00
Brad King 7676966f99 Merge topic 'InstallRequiredSystemLibraries-redist'
ecbf6546d7 IRSL: Install vcruntime140_1.dll if available
2eecd1c3bc IRSL: Prefer MSVC runtime libraries from newest toolset first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3909
2019-10-12 10:23:34 -04:00
Brad King b727e74fb0 Merge topic 'vs-v142-csharp-flags'
bbf216fb6b VS: Add toolset v142 CSharp flag table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3908
2019-10-12 10:22:21 -04:00
Alex Turbov 7cf79f4419 message: Support logging a context with each message 2019-10-12 18:21:36 +11:00
Alex Turbov 5bf85e2517 message: Add new CMAKE_MESSAGE_LOG_LEVEL variable 2019-10-12 17:01:15 +11:00
Craig Scott aa59badd6f Tests: Message log level tests must fail on unwanted output
The previous regular expressions were allowing output from
lower log levels. The tests still pass after these changes but will
now catch regressions (previously they would not have).
2019-10-12 17:01:15 +11:00
Kitware Robot a8d42ecb8d CMake Nightly Date Stamp 2019-10-12 00:01:14 -04:00
Alex Turbov 7c579f0a03 Help: Move CMAKE_MESSAGE_INDENT variable to correct section 2019-10-12 13:39:55 +11:00
Alex Turbov 4b021bd3e9 message: Minor refactor to make code less verbose 2019-10-12 13:39:55 +11:00
Brad King 6847d81856 Merge branch 'no-git-version' into release-3.16
Merge-request: !3910
2019-10-11 14:36:31 -04:00
Kyle Edwards 874396a30d CMakeVersion: Add option to disable Git suffix
Distro maintainers who are building from Git with patches added on
may want to disable the automatic Git suffixing, as it does not
provide any useful information and simply confuses the end user.
Add an undocumented CMake_VERSION_NO_GIT variable to disable this.
2019-10-11 14:32:09 -04:00
Brad King b254b0651e CMakeVersion: Prefer Git information provided by 'git archive' exports
Update the approach from commit fe2c558ba6 (CMakeVersion: Preserve Git
information during 'git archive', 2019-07-25, v3.16.0-rc1~337^2) to
prefer `export-subst` information.  This will allow exported source
trees to be imported into unrelated Git repositories while still using
the original upstream CMake commit information.
2019-10-11 13:49:59 -04:00
Brad King 75f361a00c Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.16
Merge-request: !3909
2019-10-11 12:08:51 -04:00
Brad King 83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15
Merge-request: !3909
2019-10-11 12:08:27 -04:00
Brad King ecbf6546d7 IRSL: Install vcruntime140_1.dll if available
VS 2019 now distributes this additional runtime DLL with its `14.2x`
toolsets.

Fixes: #19829
2019-10-11 12:05:51 -04:00
Brad King 2eecd1c3bc IRSL: Prefer MSVC runtime libraries from newest toolset first 2019-10-11 11:57:39 -04:00
Brad King 820f952316 Merge branch 'vs-v142-csharp-flags' into release-3.16
Merge-request: !3908
2019-10-11 11:19:02 -04:00
Brad King 881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15
Merge-request: !3908
2019-10-11 11:18:41 -04:00
Brad King bbf216fb6b VS: Add toolset v142 CSharp flag table
While the flag tables for C and C++ were generated from MSBuild `.xml`
files, the CSharp flag tables were written by hand.  Copy the `v141`
flag table to use for the `v142` toolset.

Remove the special case added by commit 626c51f47b (VS: Update for
Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) that mapped
the v142 flag table lookup to v141 since we now have the real v142
table.

Fixes: #19828
2019-10-11 11:11:20 -04:00
Brad King d26ef5d807 Merge branch 'FindPostgreSQL-macports-and-v12' into release-3.16
Merge-request: !3907
2019-10-11 11:09:46 -04:00
Ben Boeckel ec43d96657 FindPostgreSQL: support macports installation scheme
Macports installs into `include/postgresql${suffix}`. Add this to the
list of supported suffixes. Also copy the non-server
`postgresql/${suffix}` path.
2019-10-11 11:04:13 -04:00
Ben Boeckel 908dff41c6 FindPostgreSQL: support version 12 2019-10-11 11:04:13 -04:00
Brad King 18f3e28652 Merge branch 'iar-8051-support' into release-3.16
Merge-request: !3906
2019-10-11 10:23:37 -04:00
Micael Borgefeldt 5652e11ea1 IAR: Add 8051 support
Issue: #17264
2019-10-11 10:22:52 -04:00
Micael Borgefeldt 6e51db9a40 IAR: Fix v850 assembler support file extensions
Fix the file extension added by commit 158f3795b8 (IAR: Add v850
assembler support, 2019-09-23, v3.16.0-rc1~70^2).

Issue: #17264
2019-10-11 10:22:52 -04:00
Brad King 3709389520 Merge branch 'objc-c++flags' into release-3.16
Merge-request: !3904
2019-10-11 09:24:24 -04:00
Brad King fe9a903d8e Merge topic 'cmake-bin-link-job-pool'
b7509dd674 Add option to configure Ninja link job pool for CMake's own binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3901
2019-10-11 08:36:57 -04:00
Brad King 90bb63a5ef Merge branch 'release-3.16' 2019-10-11 08:35:02 -04:00
Brad King ae24597202 Merge topic 'intel-19-compile-features'
3fb146cb11 Tests: Update CompileFeatures test for Intel 19 with VS 2015
847e8bc98c Intel: Fix default C++ dialect detection on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3900
2019-10-11 08:34:16 -04:00
Brad King 3e05637280 Merge branch 'doc-unity-build' into release-3.16
Merge-request: !3905
2019-10-11 08:32:53 -04:00
Brad King ef5875b559 Merge branch 'intel-19-compile-features' into release-3.16
Merge-request: !3900
2019-10-11 08:32:37 -04:00
Brad King 13c8dbd5a6 Help: Document CMAKE_UNITY_BUILD/CMAKE_EXPORT_COMPILE_COMMANDS limitation
These two options currently do not work well together.  Mention this
limitation in the documentation.

Issue: #19826
2019-10-11 08:05:59 -04:00
Brad King ed06d27c7f Help: Extend documentation of CMAKE_UNITY_BUILD variable 2019-10-11 08:05:29 -04:00