Commit Graph
47352 Commits
Author SHA1 Message Date
Brad King 66be4621da Merge branch 'release-3.12' 2018-08-06 08:21:11 -04:00
Brad King 7142041abd Merge topic 'cuda-arch-version'
37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2251
2018-08-06 08:20:54 -04:00
Brad King 117d9f5570 Merge topic 'check-unique_ptr-pgi'
3a2c736b41 Extend C++17/C++14 feature checks to require unique_ptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2252
2018-08-06 08:19:40 -04:00
Brad King e19453d8ec Merge topic 'file-WRITE-chmod'
bdd0174df1 file(WRITE): Avoid toggling permissions between 644 and 664

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2246
2018-08-06 07:55:24 -04:00
Muhammad Ismail Soboute 496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs
Stdout and stderr will be merged.

Fixes: #18234
2018-08-06 21:27:51 +10:00
Kitware Robot d1d5709503 CMake Nightly Date Stamp 2018-08-06 00:01:16 -04:00
Craig Scott 0acbbd6dc6 Merge topic 'contributing-reference-dashboard-client'
f9b26718b7 contributing: Document that anyone can contribute testing machine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2254
2018-08-05 06:31:39 -04:00
Jean-Christophe Fillion-Robin f9b26718b7 contributing: Document that anyone can contribute testing machine 2018-08-05 20:22:06 +10:00
Craig Scott f41b653759 Merge topic 'help-testing-reference-script'
79ba596909 Help: Add link to cmake_common.cmake in test process docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2256
2018-08-05 05:36:33 -04:00
Jean-Christophe Fillion-Robin 79ba596909 Help: Add link to cmake_common.cmake in test process docs 2018-08-05 19:33:28 +10:00
Craig Scott 8c40321483 Merge topic 'readme-reference-wiki'
91e4d3df15 readme: Add reference to the wiki

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2255
2018-08-05 04:58:17 -04:00
Kitware Robot 85fcad7e63 CMake Nightly Date Stamp 2018-08-05 00:01:09 -04:00
Kitware Robot 0dc85598a1 CMake Nightly Date Stamp 2018-08-04 00:01:10 -04:00
Sebastian Holtermann 87e7904c91 Autogen: Use a single AUTOGEN setup function in cmGlobalGenerator
By moving all AUTOGEN setup code in ``cmGlobalGenerator``
into a single ``cmGlobalGenerator::QtAutoGen`` function, the
``cmGlobalGenerator::Compute`` function becomes cleaner.
2018-08-03 12:55:50 +02:00
Roger Leigh 00a5836a3d FindXercesC: Correct order of version detection and versioned library checks 2018-08-03 07:54:35 +01:00
Kitware Robot ce309b624a CMake Nightly Date Stamp 2018-08-03 00:01:05 -04:00
Kitware Robot a1d130688c CMake Nightly Date Stamp 2018-08-02 00:01:13 -04:00
Jean-Christophe Fillion-Robin 91e4d3df15 readme: Add reference to the wiki 2018-08-01 17:08:36 -04:00
Brad King 3a2c736b41 Extend C++17/C++14 feature checks to require unique_ptr
When testing compiler modes higher than C++11 for constructs we need,
include a check for using `unique_ptr` in that mode.  The PGI 18.4
compiler in some environments supports `unique_ptr` in C++11 mode
but is broken for C++14 and C++17.  Check that `unique_ptr` works
in these modes before using one.
2018-08-01 14:03:43 -04:00
Brad King c7769867d6 Merge branch 'cuda-arch-version' into release-3.12
Merge-request: !2251
2018-08-01 13:47:56 -04:00
Brad King 37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION
Since commit v3.12.0-rc1~332^2 (FindCUDA/select_compute_arch: Add
support for CUDA as a language, 2018-03-15) this module sets
`CUDA_VERSION` based on `CMAKE_CUDA_COMPILER_VERSION` when the language
is enabled.  Limit it to two components for consistency with the
normal `FindCUDA` documentation and behavior.

Fixes: #18231
2018-08-01 13:42:13 -04:00
Brad King 10d6c3a635 NAG: Pass response files through front-end to the linker
The `nagfor` compiler front-end does not support the `@rspfile` syntax.
Use `-Wl,@rspfile` instead to pass it through to the linker.

Fixes: #18232
2018-08-01 13:28:45 -04:00
Brad King c2856e0b2b XL: Use -qpic for position independent executables
The XL compiler does not have a dedicated "pie" option so use at least
`-qpic`.  This missing setting was exposed by the `ExportImport` and
`PositionIndependentTargets` tests with XL on an ELF platform.
2018-08-01 11:59:50 -04:00
Jason Heeris f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler
Add component `MCC_COMPILER` to request searching for the Matlab
compiler.  Report it in `Matlab_MCC_COMPILER` if it is found.

Issue: #18183
2018-08-01 09:23:46 -04:00
Gregor Jasny 6b7f1e1db0 Xcode: Add variables and properties to configure schemes
Add `XCODE_SCHEME_*` target properties and associated variables
`CMAKE_XCODE_SCHEME_*` to initialize them on target creation.
Map each target property value to an associated Xcode scheme entry.

Co-Author: Martin Sander <mail@martin-sander.de>
Fixes: #17919
2018-08-01 09:12:42 -04:00
Brad King 39c91d0703 cmGlobalGenerator: Add IsXcode query
Make it easy to detect use of the Xcode generator.
2018-08-01 09:12:42 -04:00
David Faure bdd0174df1 file(WRITE): Avoid toggling permissions between 644 and 664
On systems with umask 022, this function would set permissions
to 664 and restore them to 644 at the end, every single time it was
called (which is many times on e.g. install_manifest.txt).

The intent of the code was to make non-writable files temporarily
writable and to restore permissions in the end, but really, if it's
already user-writable there's no point in toggling this back and forth.
2018-08-01 09:05:33 -04:00
Julien Schueller 3434c22c29 FindMatlab: only search registry on windows hosts
From Linux, it fails when cross-compiling
2018-08-01 07:40:25 -04:00
Brad King f0e82ce9a2 Merge branch 'release-3.12' 2018-08-01 07:23:41 -04:00
Brad King 24ff152aa0 Merge topic 'UseSWIG-legacy-user-flags'
2f88c177d0 UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Julien Schueller <schueller@phimeca.com>
Merge-request: !2245
2018-08-01 07:21:34 -04:00
Brad King 9187d1c41a Merge topic 'gcc-8-warnings'
276d3c7afe IWYU: Add workaround mapping for std::hash
72f57845d3 cmXMLParser: Avoid -Wconversion warning
34257b0dd4 LexerParser: Suppress GCC -Wconversion warnings
cfa6b14f9c cmGlobalGenerator: Avoid -Wstringop-truncation warning
9df0e1f98a cmCommandArgumentParserHelper: Avoid -Wstringop-truncation warning
b6d116e240 cmCursesLongMessageForm: Avoid -Wstringop-overflow warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2244
2018-08-01 07:20:37 -04:00
Kitware Robot 0ac02edcc3 CMake Nightly Date Stamp 2018-08-01 00:01:07 -04:00
Brad King 3bab41f8f2 Merge branch 'UseSWIG-legacy-user-flags' into release-3.12
Merge-request: !2245
2018-07-31 14:01:14 -04:00
Marc Chevrier 2f88c177d0 UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGS
Fixes: #18226
2018-07-31 19:33:35 +02:00
Brad King 276d3c7afe IWYU: Add workaround mapping for std::hash
When using GCC 8's standard library IWYU thinks that `<system_error>`
must be included to get `std::hash`.  Add a mapping for `<utility>`.
2018-07-31 09:34:55 -04:00
Brad King 72f57845d3 cmXMLParser: Avoid -Wconversion warning
Add an explicit cast since we expect the conversion to be well within
range.
2018-07-31 09:34:55 -04:00
Brad King 34257b0dd4 LexerParser: Suppress GCC -Wconversion warnings
GCC 8 warns about some of the conversions in bison-generated code.
Suppress the warnings.
2018-07-31 09:34:55 -04:00
Brad King cfa6b14f9c cmGlobalGenerator: Avoid -Wstringop-truncation warning
Use `memcpy` instead of `strncpy` to copy bytes into a buffer that
is not intended to be null terminated.
2018-07-31 09:34:55 -04:00
Brad King 9df0e1f98a cmCommandArgumentParserHelper: Avoid -Wstringop-truncation warning
Use `memcpy` instead of `strncpy` to copy bytes from a buffer that
may not be null terminated.
2018-07-31 09:34:00 -04:00
Brad King b6d116e240 cmCursesLongMessageForm: Avoid -Wstringop-overflow warning
We use `strncpy` to copy the title up to a maximum number of
characters.  GCC 8's `-Wstringop-overflow` warns that the length
depends on the input length because it fails to recognize that we
are bounding it to the buffer size too.  Update the code to hide
the dependence on the input length.
2018-07-31 08:52:59 -04:00
Brad King c31d9f1c30 Merge topic 'autogen_refactor_initialization'
7bb70054e4 Autogen: Add test for Q_OS_ macros
f345135845 Autogen: For Qt5 pass all implicit include directories to moc
2d6cfe2677 Autogen: Split initializer main method
84bdae8895 Autogen: Compute variables in Init stage instead of Setup stage
8e0d70272d Autogen: Move info file write code into methods
5776639fbf Autogen: Pass absolute include path in info file
2e9199b291 cmLocalGenerator: Respect user requested implicit include directories order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2230
2018-07-31 08:08:05 -04:00
Kitware Robot 398ce17fac CMake Nightly Date Stamp 2018-07-31 00:01:05 -04:00
Sebastian Holtermann 7bb70054e4 Autogen: Add test for Q_OS_ macros 2018-07-30 09:46:03 +02:00
Sebastian Holtermann f345135845 Autogen: For Qt5 pass all implicit include directories to moc
For Qt4 it was not possible to pass all compiler implicit include
directories to moc because it couldn't handle some system headers.
For reference see commit 753b905ec8,
commit d2536579d5 and
[QTBUG-28045](https://bugreports.qt.io/browse/QTBUG-28045).

For Qt5's moc the problem does not persist anymore so we can
(and should) pass all implicit include directories to moc.

Fixes #18041
2018-07-30 09:22:47 +02:00
Sebastian Holtermann 2d6cfe2677 Autogen: Split initializer main method 2018-07-30 09:22:47 +02:00
Sebastian Holtermann 84bdae8895 Autogen: Compute variables in Init stage instead of Setup stage 2018-07-30 09:22:46 +02:00
Sebastian Holtermann 8e0d70272d Autogen: Move info file write code into methods 2018-07-30 09:22:46 +02:00
Sebastian Holtermann 5776639fbf Autogen: Pass absolute include path in info file 2018-07-30 09:22:46 +02:00
Sebastian Holtermann 2e9199b291 cmLocalGenerator: Respect user requested implicit include directories order
In ``cmLocalGenerator::GetIncludeDirectories`` append the user requested
implicit include directories first, then append the remaining implicit
include directories.  By By doing so we keep the user requested order of
implicit include directories.
2018-07-30 09:22:46 +02:00
Kitware Robot 264012dae0 CMake Nightly Date Stamp 2018-07-30 00:01:11 -04:00