Commit Graph

45389 Commits

Author SHA1 Message Date
Brad King
ee366b0273 Merge branch 'FindCurses-formw' into release-3.16
Merge-request: !3947
2019-10-28 12:04:26 -04:00
nick black
84ce473255 FindCurses: use formw when wide support is requested
Fixes: #19883
2019-10-28 12:03:11 -04:00
Brad King
f9193ca2dd Merge branch 'swift-parallel-jobs' into release-3.16
Merge-request: !3950
2019-10-28 11:37:39 -04:00
Saleem Abdulrasool
d9dd7cca66 Swift: correct flags for parallel jobs
`-num-threads` is for the threading, not the job control.  Use `-j` to
launch the parallel jobs.  This enables parallel builds for Swift again
after driver updates preventing the parallelization through
`-num-threads`.
2019-10-28 11:36:57 -04:00
Brad King
a575fbc3cb Merge branch 'docs-find-vars' into release-3.16
Merge-request: !3952
2019-10-28 11:33:05 -04:00
Brad King
62267715fe Merge branch 'framework-tests-multiarch-old-macos' into release-3.16
Merge-request: !3954
2019-10-28 10:09:29 -04:00
Craig Scott
c79e9d8c21 Merge branch 'project-version-buffer-overflow' into release-3.16
Merge-request: !3948
2019-10-28 21:55:20 +11:00
Craig Scott
f4749489fd Merge branch 'docs-FindPython-minor-grammar' into release-3.16
Merge-request: !3953
2019-10-28 21:54:30 +11:00
Craig Scott
3e30c4cc1f Tests: Match file command output for older macOS (Framework test) 2019-10-27 23:48:41 +11:00
Craig Scott
89ad3b3959 Tests: Prevent CMP0012 policy warnings in Framework test output 2019-10-27 23:28:17 +11:00
Craig Scott
9914b90f4a Help: Minor wording cleanup for Python modules 2019-10-27 21:36:31 +11:00
Craig Scott
a0a7a45dbc Help: Fix markup errors, improve wording of CMAKE_FIND... variable docs 2019-10-27 18:11:00 +11:00
Craig Scott
049dbdd38c Help: Document that <PackageName>_ROOT applies to config packages too
The original intent of <PackageName>_ROOT may have been for it
to apply only to Find modules, but the implementation of the
find_package() command treats modules and config packages the
same. Both result in a <PackageName>_ROOT variable being
pushed onto the stack of package roots. A config package can
also call other find_...() commands, the behavior doesn't apply
just to find modules.
2019-10-27 16:10:09 +11:00
Craig Scott
82cdb26c93 project: Fix potential buffer write-past-end for version components
This fixes two errors: not accounting for the trailing null and a
misunderstanding of what std::numeric_limits::digits10 means.
2019-10-26 17:50:24 +11:00
Craig Scott
15a0b0d046 Help: math() expressions must be representable as signed 64-bit 2019-10-26 17:47:03 +11:00
Brad King
81ded33c04 Merge branch 'cmp0097-doc-fix' into release-3.16
Merge-request: !3941
2019-10-24 08:01:36 -04:00
Kyle Edwards
fd867a49c4 Help: Fix capitalization in CMP0097 documentation 2019-10-23 17:05:09 -04:00
Brad King
fa1fe09dbb Merge branch 'ccmake-clear-help' into release-3.16
Merge-request: !3937
2019-10-21 11:27:13 -04:00
Brad King
eaebd4fc47 Merge branch 'FindOpenMP-include-dir' into release-3.16
Merge-request: !3916
2019-10-21 11:09:56 -04:00
Brad King
308990b2bc Merge branch 'doc-genex-tweak' into release-3.16
Merge-request: !3939
2019-10-21 10:27:21 -04:00
Alan W. Irwin
c684db4ea8 Help: Fix COMPILE_LANG_AND_ID genex example
Fix the `COMPILE_LANGUAGE/CXX_COMPILER_ID` variant of the example to
have the same meaning as the `COMPILE_LANG_AND_ID` variant.  The
inconsistency was introduced by commit 808b818063 (Genex: CompileLang
and CompileLangAndId now match against a list of ids, 2019-05-30,
v3.15.0-rc1~11^2~1).

Fixes: #19862
2019-10-21 10:25:41 -04:00
Sylvain Joubert
9276beae5e ccmake: Fully clear the 1st help line when processing 2019-10-20 14:25:05 +02:00
Brad King
92780281c2 CMake 3.16.0-rc2 v3.16.0-rc2 2019-10-18 09:23:00 -04:00
Brad King
6dedb97420 Merge branch 'pch-makefile-depends' into release-3.16
Merge-request: !3928
2019-10-17 10:41:43 -04:00
Brad King
797689ab35 PCH: Fix Makefile dependencies to rebuild PCH on header changes
Teach the Makefile generator to scan the implicit dependencies of PCH
creation.  When a header named by `target_precompile_headers` changes
the corresponding PCH must be rebuilt and all consumers recompiled.

Fixes: #19830
2019-10-17 10:29:31 -04:00
Brad King
7aab792716 Merge branch 'export-target-lang-name' into release-3.16
Merge-request: !3927
2019-10-17 10:23:36 -04:00
Craig Scott
409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang
Fixes: #18098 #18470 #18520
2019-10-17 18:50:05 +11:00
Brad King
0b10b3ed6b cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site 2019-10-16 13:48:14 -04:00
Brad King
0e436c573c install,export: Do not treat language names as target names
When generating `IMPORTED_LINK_INTERFACE_LANGUAGES`, do not treat the
entries as target names.

Fixes: #19846
2019-10-16 12:48:20 -04:00
Brad King
84e14a52ff Merge branch 'doc-pch-compile-language' into release-3.16
Merge-request: !3925
2019-10-16 10:54:11 -04:00
Brad King
ac75886525 PCH: Document and test COMPILE_LANGUAGE genex for per-language header
Fixes: #19839
2019-10-16 10:32:56 -04:00
Brad King
c2a7729177 Merge branch 'doc-add_link_options-typos' into release-3.16
Merge-request: !3922
2019-10-16 09:53:39 -04:00
Tom Lankhorst
a7ef28b9d8 Help: Fix typos and style in add_link_options documentation 2019-10-16 09:49:08 -04:00
Brad King
3658f4425a Merge branch 'swift-cross-compile' into release-3.16
Merge-request: !3921
2019-10-15 13:29:11 -04:00
Saleem Abdulrasool
466ad466b4 try_compile: support Swift for cross-compilation
Ensure that we preserve the `CMAKE_Swift_COMPILER_TARGET` variable to
use cross-compilation for testing the Swift compiler if appropriate.
2019-10-15 13:25:14 -04:00
Brad King
080163a657 Merge branch 'CMakeFindBinUtils-cleanup' into release-3.16
Merge-request: !3920
2019-10-15 11:19:53 -04:00
Brad King
c3c751e9dd Merge branch 'FindCurses-tinfow' into release-3.16
Merge-request: !3915
2019-10-15 11:19:44 -04:00
Brad King
c89794feae Merge branch 'FindHDF5-cray' into release-3.16
Merge-request: !3918
2019-10-15 11:19:31 -04:00
Brad King
4041f6a327 Merge branch 'doc-static-lib-flags' into release-3.16
Merge-request: !3919
2019-10-15 11:15:45 -04:00
Brad King
f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls
Some unset calls were added by commit 079b8e2916 (Clang: prefer lld-link
over link.exe, 2019-07-11, v3.16.0-rc1~161^2~2) but they are unnecessary
since commit 3a82ef78eb (CMakeFindBinUtils: Rename and unset variables
for additional names, 2019-07-23, v3.16.0-rc1~332^2~2).

Suggested-by: Norbert Lange <nolange79@gmail.com>
2019-10-15 11:09:06 -04:00
Manuel Herrmann
9fc87ef2e7 FindCurses: use tinfow when wide support is requested 2019-10-15 09:50:52 -04:00
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
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
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
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