Commit Graph

42655 Commits

Author SHA1 Message Date
Gregor Jasny 1166aa5ce7 ctest: refactor some code 2019-03-05 19:20:29 +01:00
Brad King 451d3907fd Merge topic 'restore_broken_curses_gui'
aa68ce6bd4 ccmake: fix curses dialog broken by refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Artur Ryt <artur.ryt@gmail.com>
Merge-request: !3055
2019-03-05 09:04:46 -05:00
Brad King 168c11f70e Merge topic 'fix_autorcc_for_qt6'
bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3049
2019-03-05 09:04:06 -05:00
Kitware Robot 4b3a739800 CMake Nightly Date Stamp 2019-03-05 00:01:20 -05:00
Felix Schwitzer aa68ce6bd4 ccmake: fix curses dialog broken by refactoring
During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize
with STL and ranged-for loops, 2019-02-10) a transformation of a loop
went wrong and editing the cmake cache with ccmake no longer works.
Make ccmake work again.

Fixes: #19008
2019-03-04 09:12:41 -05:00
Brad King 6873e98486 Merge topic 'llvm-rc'
e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand
fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3007
2019-03-04 08:42:49 -05:00
Brad King 80898a49d9 Merge branch 'release-3.14' 2019-03-04 08:37:36 -05:00
Brad King 70d204410a Merge topic 'FindPython-NumPy-fix-include-dir'
8e3358336d FindPython: Fix NumPy component include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3053
2019-03-04 08:36:29 -05:00
Brad King dbd3b1ac90 Merge topic 'vs-fortran-rc'
0b82f56ac6 VS: Fix Fortran target type selection with RC sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3050
2019-03-04 08:35:46 -05:00
Brad King 5c0ef417b8 Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14
Merge-request: !3053
2019-03-04 08:28:56 -05:00
Marc Chevrier 8e3358336d FindPython: Fix NumPy component include directory
Update the component added by commit 513e77550d (FindPython: Introduce
NumPy component, 2018-12-12, v3.14.0-rc1~95^2).  The `numpy/`
sub-directory should not be part of the include directory.  It should be
part of the `#include` line.
2019-03-04 08:28:21 -05:00
Alexandru Croitor bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet
When building a Qt project, the AUTORCC functionality, by default,
uses the rcc binary to get the contents of a qrc file for
dependency information. This is done at CMake "generate" time.

The problem is that while configuring Qt itself, the rcc binary is
not built yet.
In that case, to get the contents of the qrc file, fall back to
the code branch which uses an ifstream instead of the rcc binary.
2019-03-04 12:45:16 +01:00
Kitware Robot d1558fbf3a CMake Nightly Date Stamp 2019-03-04 00:01:14 -05:00
Kitware Robot 033728e867 CMake Nightly Date Stamp 2019-03-03 00:01:05 -05:00
Kitware Robot 26068d2db8 CMake Nightly Date Stamp 2019-03-02 00:01:09 -05:00
Brad King 77439d97fe Merge branch 'vs-fortran-rc' into release-3.14
Merge-request: !3050
2019-03-01 12:02:31 -05:00
Brad King 0b82f56ac6 VS: Fix Fortran target type selection with RC sources
The Intel Fortran `.vfproj` files do support both Fortran and the
Windows Resource compiler (`.rc)` files.  Prior to CMake 3.9 we did not
support that, but commit 2c9f35789d (VS: Decide project type by linker
lang as fallback, 2017-03-30, v3.9.0-rc1~340^2) accidentally enabled it.
It was then broken by commit d3d2c3cd49 (VS: Fix Fortran target type
selection when linking C++ targets, 2019-02-04, v3.14.0-rc1~13^2).

Restore support for Fortran+RC in VS projects and add a test case.

Fixes: #19002
2019-03-01 11:58:21 -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
Zsolt Parragi e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
llvm-rc can't handle definitions given with /D and without a space.
2019-03-01 14:11:01 +01: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