Commit Graph

36843 Commits

Author SHA1 Message Date
Sylvain Joubert
d8ecc25457 Add PREPEND sub-command to string command 2017-08-11 13:26:33 +02:00
Kitware Robot
f8a61c578b CMake Nightly Date Stamp 2017-08-11 00:01:06 -04:00
Brad King
14b2f85cd4 Merge topic 'commit_message_guidelines'
11d00a17 Help/dev: Add commit message guidelines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1106
2017-08-10 11:07:46 -04:00
Brad King
a7e95f737d Merge branch 'release-3.9' 2017-08-10 10:33:45 -04:00
Brad King
fca4423786 CMake 3.9.1 v3.9.1 2017-08-10 09:36:24 -04:00
Brad King
dfbe55b2df Merge branch 'release-3.9' 2017-08-10 09:28:58 -04:00
Brad King
c94c6bae72 Merge branch 'doc-CMP0069-typos' into release-3.9
Merge-request: !1122
2017-08-10 09:27:30 -04:00
Brad King
8c0afd2c75 Merge branch 'find-package_root-disable' into release-3.9
Merge-request: !1116
2017-08-10 09:27:19 -04:00
Brad King
249e7dabef Merge topic 'test_fixture_doc_improvements'
2e3d89a7 Help: Clarify test fixture naming and use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1114
2017-08-10 09:23:21 -04:00
Brad King
311f338ddc Merge topic 'find-package_root-test-regex'
e574bce1 Tests: Simplify RunCMake.find_package PackageRoot case regexes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Chuck Atkins <chuck.atkins@kitware.com>
Merge-request: !1115
2017-08-10 09:22:17 -04:00
Brad King
f4e66b41d8 Merge topic 'find-package_root-disable'
578d95f8 find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1116
2017-08-10 09:22:02 -04:00
Brad King
03469889f6 Merge topic 'autogen-create-include-dir'
6a0605c7 Autogen: Always create AUTOMOC/AUTOUIC include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1113
2017-08-10 09:21:42 -04:00
Brad King
af06befe66 Merge topic 'doc-CMP0069-typos'
8d56308c Help: Fix module and function names in CMP0069 examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1122
2017-08-10 09:06:58 -04:00
Ruslan Baratov
8d56308c44 Help: Fix module and function names in CMP0069 examples
Fixes: #17153
2017-08-10 09:03:49 -04:00
Kitware Robot
1b63d7cf62 CMake Nightly Date Stamp 2017-08-10 00:01:04 -04:00
Kitware Robot
92d16be9e6 CMake Nightly Date Stamp 2017-08-09 00:01:07 -04:00
Brad King
578d95f87d find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9
Disable the feature added by commit v3.9.0-rc1~71^2~2 (find_*: Add a new
PackageRoot search path group, 2017-05-03) and remove documentation
added by commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search
path group, 2017-05-03).  Unfortunately the name `<pkg>_ROOT` may
already be set by projects for their own incompatible purposes.  Disable
the behavior change for now to fix the regression for CMake 3.9.  We can
restore it later with a policy.

In order to keep the implementation and tests working, add an
undocumented variable we can use in the tests to enable the behavior
before the policy is introduced.

Fixes: #17144
2017-08-08 11:52:28 -04:00
Brad King
2610c1a733 Merge branch 'autogen-create-include-dir' into release-3.9
Merge-request: !1113
2017-08-08 10:10:09 -04:00
Brad King
bfdfc6db9d Merge branch 'release-3.9' 2017-08-08 10:09:33 -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