Commit Graph

37026 Commits

Author SHA1 Message Date
Brad King bfdfc6db9d Merge branch 'release-3.9' 2017-08-08 10:09:33 -04:00
Brad King 88c9878af9 Make libuv available to all parts of CMake
The libuv library provides many useful platform abstractions and better
process management than KWSys.  We'd like to use it everywhere instead
of just in the server mode.  Drop the `CMAKE_USE_LIBUV` option and use
libuv everywhere except during bootstrap.
2017-08-08 09:34:54 -04:00
Brad King db6ea482f6 Merge topic 'gtest-dynamic-discovery'
bfcda401 Add dynamic test discovery for for Google Test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1056
2017-08-08 09:29:48 -04:00
Brad King 3ce807f392 Merge topic 'FindPkgConfig-freebsd-pkgconfig-dir'
07a4be0d FindPkgConfig: On FreeBSD search in `libdata/pkgconfig`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1108
2017-08-08 09:23:34 -04:00
Brad King 165778c809 Merge topic 'ctest-launch-match-details'
1c61d240 CTest: Report lines matched by launchers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1084
2017-08-08 09:22:42 -04:00
Brad King e3bcf72df8 Merge topic 'update-expat'
e4ea628b expat: Update CMake build for 2.2.3
44e5fb9c Merge branch 'upstream-expat' into update-expat
7e08602c expat 2017-08-02 (97c6bd01)
6276ec37 expat: Update script to get Expat 2.2.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1110
2017-08-08 09:22:25 -04:00
Brad King 21e86adaf6 Merge topic 'drop-HP-UX'
49640d36 HP-UX: Drop support for building CMake on HP-UX
acd462dd README: Add AIX to list of supported platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1105
2017-08-08 09:22:00 -04:00
Brad King 9e2a8afb57 Merge branch 'find-package_root-test-regex' into release-3.9
Merge-request: !1115
2017-08-08 08:26:58 -04:00
Brad King 6e5ad2716f Merge branch 'update-expat' into release-3.9
Merge-request: !1110
2017-08-08 08:26:44 -04:00
Brad King e574bce15b Tests: Simplify RunCMake.find_package PackageRoot case regexes 2017-08-08 08:23:57 -04:00
Craig Scott 2e3d89a70b Help: Clarify test fixture naming and use
* Make it clearer that fixture names are distinct from test case names.
* Mention -FS, -FC and -FA ctest command line options for overriding
  fixture behavior.

Fixes: #17141
2017-08-08 22:02:07 +10:00
Craig Scott 11d00a17aa Help/dev: Add commit message guidelines 2017-08-08 21:17:32 +10:00
Sebastian Holtermann 6a0605c711 Autogen: Always create AUTOMOC/AUTOUIC include directory
The **AUTOGEN** include directory was always passed to the compiler but
only generated on demand. To avoid compiler complaints when using
`-Wmissing-include-dirs` make sure the directory gets created always.

Closes #17147
2017-08-08 12:11:10 +02:00
Kitware Robot b17b6dbb8e CMake Nightly Date Stamp 2017-08-08 00:01:06 -04:00
Bill Hoffman 1c61d240dd CTest: Report lines matched by launchers
Since launchers show the entire stderr/stdout for a command and only
skip it if all of the lines are suppressed, it can be hard to tell if
individual suppressions are working.  Mark up the output reported to
CDash with a prefix for each line indicating whether it was a matched or
suppressed warning.  Lines that are suppressed are prefixed with
`[CTest: warning suppressed]` and lines that match the warning
expression are prefixed with `[CTest: warning matched]`. This should
make it easier for people to add suppressions as they will know what
they need to match and what they have already suppressed. This is an
issue because if there is more than one warning in a single compiler
output you have to suppress all of them before it will go away.
2017-08-07 11:01:49 -04:00
Shin-ya Murakami 07a4be0d9c FindPkgConfig: On FreeBSD search in libdata/pkgconfig
The pkgconfig dir is placed at `${PREFIX}/libdata/pkgconfig` on FreeBSD
instead of `${PREFIX}/lib/pkgconfig`, where `${PREFIX}` is `/usr/local`
as default.
2017-08-07 10:51:16 -04:00
Brad King 3a0ef7ac1a Merge topic 'autogen-configs'
5150c352 Autogen: Add release notes for per-config include dir
ccc98b5c Autogen: Update documentation for per-config include dir
a13716a5 Autogen: Enable per-config support
6d83757f Autogen: Generate rcc wrapper file on demand
74a1b8eb Autogen: Fix configuration suffix initialization
ddd6f0db Autogen: Add per-config suffix to moc_predefs.h
e2c9cf12 Autogen: Remove per-config suffix for mocs_compilations.cpp
3a4840e0 Autogen: Make test per-config include directory compatible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1107
2017-08-07 10:34:48 -04:00
Brad King e4ea628b42 expat: Update CMake build for 2.2.3 2017-08-07 10:22:13 -04:00
Brad King 44e5fb9c7e Merge branch 'upstream-expat' into update-expat
* upstream-expat:
  expat 2017-08-02 (97c6bd01)
2017-08-07 10:19:30 -04:00
Expat Upstream 7e08602c76 expat 2017-08-02 (97c6bd01)
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit 97c6bd01990090d4015364ae37dd141f3c39a30f (R_2_2_3).
2017-08-07 10:06:36 -04:00
Brad King 6276ec3726 expat: Update script to get Expat 2.2.3 2017-08-07 10:06:23 -04:00
Brad King 49640d3629 HP-UX: Drop support for building CMake on HP-UX
CMake will soon require both C++11 and libuv to build.  Neither of
these works on HP-UX, so unfortunately we need to drop support for
the platform until someone can get them working.

Issue: #17137
2017-08-07 09:16:09 -04:00
Kitware Robot 1f20aff2a6 CMake Nightly Date Stamp 2017-08-07 00:01:05 -04:00
Kitware Robot 8d189ebd14 CMake Nightly Date Stamp 2017-08-06 00:01:04 -04:00
Sebastian Holtermann 5150c3527d Autogen: Add release notes for per-config include dir 2017-08-05 15:06:16 +02:00
Sebastian Holtermann ccc98b5cbe Autogen: Update documentation for per-config include dir 2017-08-05 15:01:28 +02:00
Sebastian Holtermann a13716a5dc Autogen: Enable per-config support
Enables the AUTOGEN per-config include directories and wrapper sources
for multi configuration generators.

Closes #16460
2017-08-05 14:37:03 +02:00
Sebastian Holtermann 6d83757f26 Autogen: Generate rcc wrapper file on demand
For multi configuration generators remove per-config
qrc_FOO_$<CONFIG>.cpp source file support.
Instead use a single source file qrc_FOO.cpp which is a wrapper
that includes the actual rcc generated qrc_FOO_CONFIG.cpp file.

This way, after a repeated configuration change, only the wrapper file
qrc_FOO.cpp must be regenerated to include the appropriate
qrc_FOO_CONFIG.cpp file.
2017-08-05 14:21:50 +02:00
Sebastian Holtermann 74a1b8ebde Autogen: Fix configuration suffix initialization
The configuration suffix was used before it was initialized.
2017-08-05 12:46:10 +02:00
Sebastian Holtermann ddd6f0db1e Autogen: Add per-config suffix to moc_predefs.h
moc_predefs.h is generated using per-config -D definitions
and therefore must be configuration specific as well.
2017-08-05 12:27:11 +02:00
Sebastian Holtermann e2c9cf12d1 Autogen: Remove per-config suffix for mocs_compilations.cpp 2017-08-05 12:08:14 +02:00
Sebastian Holtermann 3a4840e039 Autogen: Make test per-config include directory compatible 2017-08-05 11:21:44 +02:00
Kitware Robot 7c7a57ce9e CMake Nightly Date Stamp 2017-08-05 00:01:06 -04:00
Brad King acd462dd31 README: Add AIX to list of supported platforms
It was left out accidentally.
2017-08-04 09:45:03 -04:00
Brad King eed33adc6a Merge branch 'release-3.9' 2017-08-04 09:39:41 -04:00
Brad King c2cc764582 Merge topic 'FindCygwin-64-bit'
0184531a FindCygwin: Look for Cygwin in C:\Cygwin64.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1091
2017-08-04 09:24:25 -04:00
Gerald Combs 0184531a63 FindCygwin: Look for Cygwin in C:\Cygwin64.
Add "C:\Cygwin64" to the list of Cygwin search paths.
2017-08-04 09:23:05 -04:00
Brad King 51f08783c2 Merge topic 'genex-error-grammar'
e49c9eec cmGeneratorExpressionNode: add some missing commas

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1102
2017-08-04 09:17:24 -04:00
Brad King b745cb3e55 Merge topic 'file_WRITE_docs'
d7472bbf file: Clarify directory creation behavior when using WRITE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1088
2017-08-04 09:16:46 -04:00
Brad King 70c326f0f1 Merge topic 'doc-file-GLOB-sorted'
75ca5f04 Help: Document that file(GLOB) result is sorted

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1098
2017-08-04 09:16:06 -04:00
Brad King 86a107cb5c Merge topic 'set_IAR_excetion_option'
168b42d2 IAR: Enable extensions by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1081
2017-08-04 09:15:14 -04:00
Brad King c5c8ee1a9b Merge topic 'FindHDF5-importedconf-fix'
4956fc26 FindHDF5: fixes for HL when using an imported config
4150048a FindHDF5: unset some variables
9310d008 FindHDF5: for a static imported config, use CONFIG-specific library
fc982844 FindHDF5: fix hdf5-config case with more than one configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1064
2017-08-04 09:14:31 -04:00
Brad King 496eed60f3 Merge topic 'doc-release-notes-orphan'
9e225766 Help: Silence warning about document not included in toctree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1077
2017-08-04 09:12:12 -04:00
Brad King 15f1602584 Merge topic 'android-plain-sysroot'
68d67c82 Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1101
2017-08-04 09:11:43 -04:00
Brad King d4c2a58d13 Merge topic 'vs-VCTargetsPath-force-config'
fe3b481b VS: Fix VCTargetsPath detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1100
2017-08-04 09:10:57 -04:00
Brad King 18cbf898f8 Merge topic 'add-package_root-to-find_package'
4a207116 find_package: Split PACKAGE_ROOT tests to work with smaller regex
9722ff5a find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode.
c5d2b99c find_package: Add missing PACKAGE_ROOT_PATH search path implementation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1082
2017-08-04 09:09:59 -04:00
Kitware Robot c9b3ad6f6b CMake Nightly Date Stamp 2017-08-04 00:01:06 -04:00
Brad King 8fb12ce7a2 Merge branch 'add-package_root-to-find_package' into release-3.9
Merge-request: !1082
2017-08-03 15:05:30 -04:00
Robert Dailey d7472bbf16 file: Clarify directory creation behavior when using WRITE
When using `file(WRITE)`, parent directories are also created. Documentation
has been updated to explain this behavior.

Co-Author: Craig Scott <craig.scott@crascit.com>
2017-08-03 14:11:26 -04:00
Ruslan Baratov 75ca5f04df Help: Document that file(GLOB) result is sorted
It has been sorted since commit v3.6.0-rc1~54^2 (file: Sort GLOB results
to make it deterministic, 2016-05-14).  That commit left the order
unspecified in the documentation, but has been stable long enough to
document now.
2017-08-03 14:00:07 -04:00