Commit Graph

36880 Commits

Author SHA1 Message Date
Brad King
e488c7f9ee bootstrap: Restore output redirection instead of "grep -q"
This reverts commit 567bac890c (bootstrap: use "grep -q" instead of
output redirection, 2017-06-07).  On Solaris `grep -q` does not exist.
2017-08-16 11:09:39 -04:00
Brad King
8ebd590b21 Merge topic 'cpack-deb-ipk'
a17ef574 CPackDeb: Loosen filename requirement to allow for .ipk

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1093
2017-08-15 13:19:53 -04:00
Brad King
f2cab9855b Merge topic 'server-allow-cache'
9b3c5ccf Server: test cache after reconnect
1df38758 cmServerProtocol: allow 'cache' request before 'configure'
187332b2 cmServerProtocol: fix test of empty values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !977
2017-08-15 13:17:49 -04:00
Brad King
8cfd52981d Merge topic 'autogen-less-verbose'
53640a46 Autogen: Only print Qt Autogenerator messages when verbose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1133
2017-08-15 13:16:35 -04:00
Brad King
e1c92163d3 Merge topic 'update-kwsys'
060cef0c Merge branch 'upstream-KWSys' into update-kwsys
9e002621 KWSys 2017-08-11 (e1006189)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1130
2017-08-15 13:09:40 -04:00
Brad King
683dbfe14d Merge topic 'require-cmake-3.1'
fb0c3c56 Require CMake 3.1 to build CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1126
2017-08-15 13:09:20 -04:00
Brad King
8fb9a5770a Merge topic 'cpackifw-package-file-extension'
45623e72 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1117
2017-08-15 13:08:26 -04:00
Kitware Robot
4ca8c08f36 CMake Nightly Date Stamp 2017-08-15 00:01:04 -04:00
Kitware Robot
ce2750817b CMake Nightly Date Stamp 2017-08-14 00:01:07 -04:00
Daniel Pfeifer
9b3c5ccf12 Server: test cache after reconnect 2017-08-13 23:20:11 +02:00
Daniel Pfeifer
1df3875871 cmServerProtocol: allow 'cache' request before 'configure'
Fixes: #16989
2017-08-13 22:02:31 +02:00
Daniel Pfeifer
187332b2fa cmServerProtocol: fix test of empty values
If a required value is in the cache, it is not necessary to set it
explicitly.

Fixes: #16948, #16988
2017-08-13 22:02:30 +02:00
Craig Scott
e6ca528be3 Merge topic 'cpack-CPACK_COMPONENTS_ALL-extra-docs'
d2c9efa9 CPack: additional CPACK_COMPONENTS_ALL documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1134
2017-08-13 06:59:01 -04:00
Kitware Robot
02f6bb1a81 CMake Nightly Date Stamp 2017-08-13 00:01:04 -04:00
Nils Gladitz
a17ef5748a CPackDeb: Loosen filename requirement to allow for .ipk
The OPKG packaging system uses deb like package files with
an .ipk extension. Allow the DEB generator to be used in that context.
2017-08-12 17:27:06 +02:00
Domen Vrankar
d2c9efa947 CPack: additional CPACK_COMPONENTS_ALL documentation 2017-08-12 10:54:27 +02:00
Matthias Kuhn
53640a4610
Autogen: Only print Qt Autogenerator messages when verbose
Unconditionally printing these messages prevents ninja builds from
filtering successful commands and only show errors and warnings.

Fix #17157
2017-08-12 09:29:36 +02:00
Kitware Robot
e4f16a06ab CMake Nightly Date Stamp 2017-08-12 00:01:12 -04:00
Brad King
060cef0c44 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-08-11 (e1006189)
2017-08-11 10:13:23 -04:00
KWSys Upstream
9e0026216f KWSys 2017-08-11 (e1006189)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit e100618908f7f7a41cbe623afa79ca0e4f17834a (master).

Upstream Shortlog
-----------------

Chuck Atkins (2):
      993f0ea4 Add an option to split object and interface libs.
      b61faf89 Fix install rules and usage requirements for interface+object libs

Justin Berger (2):
      6d73752d Allow KWSYSPE_USE_SELECT macro to be overriden at compile time.
      da61baff Added cmake settable property to enable the macro

Sean McBride (1):
      dfa13188 Fixed a couple of trivial clang -Wunused-macros warnings

Shawn Waldon (1):
      da8a9e65 SystemTools: make GetFilenameName handle either kind of slash
2017-08-11 10:13:22 -04:00
Brad King
c47c011c77 Merge topic 'github-pr-template'
7983e068 Add GitHub PR template to point contributors at CONTRIBUTING.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1125
2017-08-11 09:51:54 -04:00
Brad King
73657a35e6 Merge topic 'libuv-required'
88c9878a Make libuv available to all parts of CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1104
2017-08-11 09:17:04 -04:00
Brad King
1d51fcaeaf Merge topic 'autogen-merge-redundant'
15ef2728 Autogen: Add test for OBJECT libraries
362f9bd7 Autogen: Merge and remove redundant function calls
952fc65d Autogen: Clear sources meta data cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1120
2017-08-11 09:14:40 -04:00
Brad King
0baf114a35 Merge topic 'genex-COMPILE_FEATURES-stds'
4f7d9eef Features: Fix COMPILE_FEATURES genex for C++ 14 and 17 features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1118
2017-08-11 09:13:39 -04:00
Brad King
d4b70a20fa Merge topic 'FindCUDA-superseded'
ae813b6b FindCUDA: Document that module has been superseded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1124
2017-08-11 09:12:37 -04:00
Brad King
485cbd456a Merge topic 'findcuda_dont_ignore_CUDA_USE_STATIC_CUDA_RUNTIME'
d9c8aa47 FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1123
2017-08-11 09:12:18 -04:00
Brad King
eda45e9f17 Merge topic 'FindCUDA-cuda9'
cbf1393a FindCUDA: Add CUDA9/Volta recognition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1119
2017-08-11 09:11:43 -04:00
Brad King
7983e068e1 Add GitHub PR template to point contributors at CONTRIBUTING.rst
GitHub's link to the contribution guidelines in `CONTRIBUTING.rst`
is not prominent enough to be reliably noticed and followed by
new contributors.  Add a PR template to make the link more visible.
2017-08-11 08:23:09 -04:00
Kitware Robot
f8a61c578b CMake Nightly Date Stamp 2017-08-11 00:01:06 -04:00
Sebastian Holtermann
15ef27286a Autogen: Add test for OBJECT libraries 2017-08-10 23:15:48 +02:00
Brad King
fb0c3c564c Require CMake 3.1 to build CMake itself
This simplifies some policy settings and use of third-party
libraries with imported targets.
2017-08-10 15:08:02 -04:00
Sebastian Holtermann
362f9bd755 Autogen: Merge and remove redundant function calls 2017-08-10 18:48:15 +02:00
Sebastian Holtermann
952fc65d14 Autogen: Clear sources meta data cache
Adds cmGeneratorTarget::clearSourcesCache() which clears the cache
of precomputed sources lists and object names. The cache gets
recomputed on demand.

Clearing the cache is necessary in case an OBJECT library
gets a source added after a target (ORIGIN) that includes it
computed it's external sources cache.
This may happen in AUTOMOC when ORIGIN is processed before the
OBJECT library which gets a mocs_compilation.cpp file added.

Closes #17152
Closes #17139
Closes #17085
Closes #15967
2017-08-10 18:33:02 +02:00
Boris Fomitchev
cbf1393aa4 FindCUDA: Add CUDA9/Volta recognition 2017-08-10 11:10:07 -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
ae813b6bcc FindCUDA: Document that module has been superseded
Add a note at the top of the module documentation to point readers
at the first-class support for the CUDA language.
2017-08-10 10:22:53 -04:00
Brad King
fca4423786 CMake 3.9.1 2017-08-10 09:36:24 -04:00
Robert Maynard
d9c8aa47c2 FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option.
Fixes #17150, where the FindCUDA would incorrectly handle
CUDA_USE_STATIC_CUDA_RUNTIME being set to false.
2017-08-10 09:33:06 -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
Konstantin Podsvirov
45623e7255 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable
Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable to customize
target binary format.
2017-08-10 00:20:11 +03:00