Commit Graph

42636 Commits

Author SHA1 Message Date
Kitware Robot
26068d2db8 CMake Nightly Date Stamp 2019-03-02 00:01:09 -05:00
Brad King
6bc6f41068 Merge branch 'release-3.14' 2019-03-01 11:12:28 -05:00
Brad King
20a41aa589 CMake 3.14.0-rc3 v3.14.0-rc3 2019-03-01 09:25:27 -05:00
Brad King
57fd4b9d65 Merge branch 'release-3.14' 2019-03-01 09:10:51 -05:00
Brad King
980d9a987d Merge topic 'cuda_device_link_handle_frameworks'
d5d1b15654 CUDA: Filter out -framework arguments during device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3039
2019-03-01 09:08:56 -05:00
Brad King
4cda0b66fa Merge topic 'ExternalProject-fix-log-in-custom-stamp'
a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3045
2019-03-01 09:08:15 -05:00
Brad King
8b1716a62a Merge topic 'vs2019'
c9a7f3135e Help: Update VS 2019 generator release note for preview 4
00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Egor Pugin <egor.pugin@gmail.com>
Merge-request: !3044
2019-03-01 09:07:29 -05:00
Brad King
96a99d4069 Merge topic 'findjni-paths'
77cede0977 FindJNI: Unify path search, fix support for Java 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3042
2019-03-01 09:06:52 -05:00
Brad King
8d9cf29074 Merge branch 'findjni-paths' into release-3.14
Merge-request: !3042
2019-03-01 09:05:57 -05:00
Brad King
911d67b173 Merge topic 'doc-install-internal-xref'
b8307adb9f Help: inter-link install() commands
19e15853e9 Help: add inter link anchors for install() commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3034
2019-03-01 08:53:31 -05:00
Christian Pfeiffer
77cede0977 FindJNI: Unify path search, fix support for Java 9
Java 9 restructured the standard location of the AWT libraries due to
the removal of the JRE/JDK separation. We should check all possible
combinations of subdirectories to the Java root directories to ensure
that the libraries will be found after an upgrade.

Furthermore, a root directory would contain both, include and library
paths, so the search should be unified to ease maintenance on the
module.
2019-03-01 08:53:26 -05:00
Brad King
0465c32a82 Merge topic 'processor_count_linux_containers'
f20eab9cdc ProcessorCount: Return the container CPU count instead of the host count

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3032
2019-03-01 08:52:37 -05:00
Brad King
9a5fe96f4f Merge topic 'drop-MIPSpro'
e21bae378d WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSpro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3043
2019-03-01 08:51:50 -05:00
Brad King
9a54159f53 Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14
Merge-request: !3045
2019-03-01 08:02:26 -05:00
Brad King
338e32b3b8 Merge branch 'cuda_device_link_handle_frameworks' into release-3.14
Merge-request: !3039
2019-03-01 08:02:11 -05:00
Brad King
a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir
In commit b6f6cac378 (ExternalProject: add LOG_DIR option that allows
overriding of log location, 2018-10-12, v3.14.0-rc1~515^2~1) the log
directory got its own option.  The intention was to fall back to the
stamp directory by default.  However, the implementation actually only
falls back to the same default as the stamp directory and does not
consider a custom stamp dir.

Update the default log dir computation to fall back to whatever is the
final selection for the stamp dir.

Fixes: #19000
2019-03-01 07:54:17 -05:00
Kitware Robot
2f59cd6371 CMake Nightly Date Stamp 2019-03-01 00:01:07 -05:00
Robert Maynard
d5d1b15654 CUDA: Filter out -framework arguments during device linking
The filter in commit e768d96c74 (CUDA: Filter out host link flags during
device linking, 2018-10-22, v3.13.0-rc2~4^2~2^2) removes `-framework`
but not the framework name that comes after it.  Revise the logic to
remove both.

Fixes: #18911
2019-02-28 14:56:11 -05:00
Brad King
71852e969b Merge branch 'vs2019' into release-3.14
Merge-request: !3044
2019-02-28 13:25:51 -05:00
NeroBurner
b8307adb9f Help: inter-link install() commands 2019-02-28 11:49:53 -05:00
NeroBurner-tux
19e15853e9 Help: add inter link anchors for install() commands 2019-02-28 11:49:23 -05:00
Brad King
d84fb10034 Merge topic 'ppc64-toc-overflow'
5c58a7e4d2 ppc64: Work around TOC overflow with platform specific linker flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3038
2019-02-28 11:46:10 -05:00
Brad King
95222584ee Merge topic 'doc-xref-EXPORT_NAME'
c29a1d58d9 Help: Link from install(TARGET) to EXPORT_NAME to rename exported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3037
2019-02-28 11:45:17 -05:00
Brad King
ce4eec97af Merge topic 'doc-EXPORT_NAME'
dac7e8b833 Help: Link from EXPORT_NAME to relevant export commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3033
2019-02-28 11:44:35 -05:00
Brad King
d0a328c9f6 Merge topic 'refactor-handle-path-command'
9636b03cca cmFileCommand: Refactor HandleCMakePathCommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2960
2019-02-28 11:43:39 -05:00
Brad King
6066aa471e Merge topic 'optimize_ge_node_lookup'
a490ea4a28 cmGeneratorExpressionNode: Initialize node key map in class constructor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3031
2019-02-28 11:42:32 -05:00
Brad King
bfd71fc05c Merge topic 'features-from-default-standard'
c7213ca870 Features: Do not use a lower-than-default standard for requested features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3023
2019-02-28 11:41:43 -05:00
Brad King
e21bae378d WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSpro
Code removed for MIPSpro by commit 214fcefa52 (Remove now-unused code
once used for MIPSpro on IRIX, 2019-02-21) actually changed a
public-facing API by dropping the `<prefix>_COMPILER_IS_MIPSpro`
definition from the generated compiler detection header.  Restore the
definition hard-coded to `0` since the compiler will never be MIPSpro.

Reported-by: Hans Johnson <hans-johnson@uiowa.edu>
2019-02-28 11:34:36 -05:00
Brad King
c9a7f3135e Help: Update VS 2019 generator release note for preview 4 2019-02-28 11:05:31 -05:00
Brad King
00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3
A temporary workaround added by commit 626c51f47b (VS: Update for Visual
Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) is no longer needed
as of VS 2019 preview 4.

Fixes: #18898
2019-02-28 11:04:29 -05:00
Brad King
4a79cdc85f Merge branch 'release-3.14' 2019-02-28 11:01:02 -05:00
Brad King
a4f2dd9577 Merge topic 'check-std-size-cbegin-cend'
e6195989c7 Merge branch 'backport-check-std-size-cbegin-cend'
a605bf438e Extend C++17/C++14 feature checks to cover more standard library APIs
e17deb7ad4 Extend C++17/C++14 feature checks to cover more standard library APIs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3030
2019-02-28 11:00:13 -05:00
Brad King
93091cabac Merge branch 'release-3.14' 2019-02-28 10:57:50 -05:00
Brad King
8989fa255b Merge topic 'FindThreads-revert-libc-check'
18320230ec FindThreads: Revert libc symbol check to pthread_create
e0267eb1d3 FindThreads: Fix libc check to use proper header for pthread_kill

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !3022
2019-02-28 10:25:03 -05:00
Kyle Edwards
0d9471fa2d Merge topic 'remove_duplicates-order'
258298f597 Help: Clarify ordering of list(REMOVE_DUPLICATES)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3035
2019-02-28 10:18:52 -05:00
Kitware Robot
0df31d99ae CMake Nightly Date Stamp 2019-02-28 00:01:08 -05:00
Chuck Atkins
5c58a7e4d2 ppc64: Work around TOC overflow with platform specific linker flags 2019-02-27 13:00:00 -06:00
NeroBurner
c29a1d58d9 Help: Link from install(TARGET) to EXPORT_NAME to rename exported target 2019-02-27 11:53:02 -05:00
NeroBurner
dac7e8b833 Help: Link from EXPORT_NAME to relevant export commands 2019-02-27 17:44:00 +01:00
Brad King
18731d60ac Merge branch 'backport-check-std-size-cbegin-cend' into release-3.14
Merge-request: !3030
2019-02-27 11:32:31 -05:00
Brad King
e6195989c7 Merge branch 'backport-check-std-size-cbegin-cend' 2019-02-27 11:27:31 -05:00
Mathieu Garaud
a605bf438e Extend C++17/C++14 feature checks to cover more standard library APIs
Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or
C++14 mode before choosing the corresponding standard level for
compiling CMake itself.  This helps in cases that the compiler is using
a standard library too old to support the full standard level chosen.
2019-02-27 11:27:17 -05:00
Mathieu Garaud
e17deb7ad4 Extend C++17/C++14 feature checks to cover more standard library APIs
Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or
C++14 mode before choosing the corresponding standard level for
compiling CMake itself.  This helps in cases that the compiler is using
a standard library too old to support the full standard level chosen.
2019-02-27 11:24:43 -05:00
Kyle Edwards
258298f597 Help: Clarify ordering of list(REMOVE_DUPLICATES)
This also adds a test to enforce the order behavior of
list(REMOVE_DUPLICATES).
2019-02-27 11:22:57 -05:00
Brad King
e0d7078f6f Merge branch 'FindThreads-revert-libc-check' into release-3.14
Merge-request: !3022
2019-02-27 09:04:11 -05:00
Brad King
b13a8441cd Merge topic 'ninja-dyndep-lang-aware'
f22c18b1c1 ninja: name dyndep internal files using the object file
7c78adca8e cmNinjaTargetGenerator: remove "preprocessed" mentions in dyndep
933dd91642 ninja: do not assume explicit preprocessing uses that output
2c0a7bc770 ninja: pass language to cmake_ninja_depends
72f9bb2993 ninja: make dyndep generation language aware
2dd0cb7aeb Help: note that Ninja also uses OBJECT_OUTPUTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2997
2019-02-27 08:21:32 -05:00
Brad King
07421e6785 Merge topic 'autogen_variable_names'
63191b169e Autogen: Use more readable variable names for static const AUTO* strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3026
2019-02-27 08:20:42 -05:00
Brad King
23bcac5d58 Merge topic 'ctest-clean-compress'
b5a69c6279 cmcompress: Delete unused 3rdParty module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3019
2019-02-27 08:20:03 -05:00
Brad King
c3ce9cfe15 Merge branch 'release-3.14' 2019-02-27 08:19:05 -05:00
Brad King
557d4b5882 Merge topic 'cmake_role-vs-fix'
e795be115e Merge branch 'master' into cmake_role-vs-fix
4b95e7fe63 CMAKE_ROLE: Fix value in --build for Visual Studio generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3028
2019-02-27 08:09:42 -05:00