Commit Graph

37213 Commits

Author SHA1 Message Date
Kitware Robot f06ddacafc CMake Nightly Date Stamp 2017-09-12 00:01:09 -04:00
Brad King 71676863bc Merge topic 'find-openssl'
d371b52f FindOpenSSL: Search 'ssld' and 'crypod' for debug variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1246
2017-09-11 08:00:03 -04:00
Brad King 1c9d3c0d32 Merge topic 'doc-find_dependency-return'
e48acfc5 CMakeFindDependencyMacro: Document return() behavior and caveats
07a05079 CMakeFindDependencyMacro: Convert documentation to bracket comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1245
2017-09-11 07:56:02 -04:00
Brad King 28adf3833c Merge topic 'vs_improve_custom_command'
9ed24280 VS: only add custom command line if it is not empty
34c4108b add HasOnlyEmptyCommandLines() method to cmCustomCommandGenerator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1050
2017-09-11 07:53:18 -04:00
Brad King bf19bb5609 Merge topic 'timestamp'
014ad298 Timestamp: support %A and %B

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1228
2017-09-11 07:49:40 -04:00
Brad King 15b26ace18 Merge topic 'show_weighted_times'
b2242ea9 Help: Update documentation for PROCESSORS test property
5b829c89 CTest: Weight reported test times by PROCESSORS in summaries
a6e32eb0 CTest: Split out labels and subproject labels in summary output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1226
2017-09-11 07:48:46 -04:00
Brad King e8463e3570 Merge topic 'findmatlab-remove-CMAKE_CL_64'
f34ac1c6 FindMatlab: Don't use the deprecated variable CMAKE_CL_64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1234
2017-09-11 07:47:31 -04:00
Kitware Robot 00975e9261 CMake Nightly Date Stamp 2017-09-11 00:01:05 -04:00
Kitware Robot db9b6b266f CMake Nightly Date Stamp 2017-09-10 00:01:05 -04:00
Kitware Robot e18ab9c4b2 CMake Nightly Date Stamp 2017-09-09 00:01:09 -04:00
Robert Dailey d371b52fdf FindOpenSSL: Search 'ssld' and 'crypod' for debug variants
Release variant search already considered `ssl` and `crypto`, but
similarly named libs with `d` postfix were not searched for debug
variant.
2017-09-08 13:57:55 -05:00
Brad King e48acfc501 CMakeFindDependencyMacro: Document return() behavior and caveats
The `find_dependency` macro is designed to be called from Package
Configuration Files, not from Find Modules.  The return() behavior is
particularly problematic for find modules.  Document this more clearly.

Issue: #17257
2017-09-08 10:44:45 -04:00
Brad King 07a05079d3 CMakeFindDependencyMacro: Convert documentation to bracket comment 2017-09-08 10:30:24 -04:00
Bill Hoffman b2242ea964 Help: Update documentation for PROCESSORS test property
This updates the documentation for the PROCESSORS test property to show
how it will affect the summary output for labels and sub projects.
2017-09-08 10:03:53 -04:00
Bill Hoffman 5b829c89b8 CTest: Weight reported test times by PROCESSORS in summaries
This commit changes the times reported by labels and subprojects to be
weighted by the PROCESSORS property. It is reported with `sec*proc`
instead of just `sec`.
2017-09-08 10:03:01 -04:00
Bill Hoffman a6e32eb0c2 CTest: Split out labels and subproject labels in summary output
This commit splits out the reporting of labels and labels used for sub
projects. If a label is a sub project label it will not be included in
the label summary.  To implement this the commit creates
PrintLabelOrSubprojectSummary which is able to do the work of both
PrintLabelSummary and PrintSubprojectSummary avoiding code duplication.
2017-09-08 10:02:39 -04:00
Job Noorman f34ac1c69b FindMatlab: Don't use the deprecated variable CMAKE_CL_64
The variable is not defined on 64-bit MinGW, causing a 32-bit Matlab
version to be found.  Check using CMAKE_SIZEOF_VOID_P instead.
2017-09-08 09:53:27 -04:00
Brad King d4f58a9cd8 Merge topic 'fphsa-version-cleanup'
91935d9e FPHSA: lower-case for cmake_parse_arguments + move config-mode related code
aec27c15 FPHSA: use more localized _FOUND_VERSION instead of VERSION.
0019bfeb FPHSA: Add (failing) unit test in case a cache variable VERSION is present
81844334 FPHSA: add (failing) unit test for found version being equal to 0.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !1224
2017-09-08 09:48:15 -04:00
Brad King 2581ab4395 Merge topic 'boost-1.65.1'
dbba53a5 FindBoost: Add version 1.65.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1241
2017-09-08 09:46:32 -04:00
Brad King 8bd26d7eac Merge topic 'findfreetype-importedtargets'
b1d1c56c Help: Add notes for topic 'FindFreetype-importedtargets'
457c2021 FindFreetype: Add imported target, docs, and test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1219
2017-09-08 09:46:00 -04:00
Brad King e5c1a7dfb3 Merge topic 'autogen-digests'
6739a125 Autogen: Doc: Add Visual Studio PRE_BUILD note to cmake-qt.rst
2be0acb7 Autogen: Tests: Add AUTOGEN_TARGET_DEPENDS test to mocDepends tests
734d236c Autogen: Smarter target dependency computation
2e4dab08 Autogen: Set CM_DISABLE_COPY in cmQtAutoGenerators
c330d641 Autogen: Replace CM_AUTO_PTR with std::unique_ptr
9468e926 Autogen: Refactor logging
2ba1b281 Autogen: More use of scoped lambdas
0f9080e2 Autogen: More use of scoped lambdas
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1198
2017-09-08 09:45:07 -04:00
Kitware Robot 90b6186cbd CMake Nightly Date Stamp 2017-09-08 00:01:10 -04:00
Bernhard M. Wiedemann 014ad2989c Timestamp: support %A and %B
These are defined both by [1] and [2] to give full names of a weekday
and month.

[1] http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html
[2] https://msdn.microsoft.com/de-de/library/fe06s4ak.aspx
2017-09-07 13:36:11 -04:00
Brad King d2a707aaa4 Merge branch 'release-3.9' 2017-09-07 13:16:25 -04:00
Ben Morgan b1d1c56cfd Help: Add notes for topic 'FindFreetype-importedtargets' 2017-09-07 17:52:41 +01:00
Ben Morgan 457c202196 FindFreetype: Add imported target, docs, and test 2017-09-07 17:52:33 +01:00
Brad King ffa164736e CMake 3.9.2 v3.9.2 2017-09-07 12:14:26 -04:00
Brad King b7b9bae54a Merge branch 'release-3.9' 2017-09-07 12:13:28 -04:00
Brad King 53f15b730a Merge branch 'backport-genex-SOURCES-test' into release-3.9 2017-09-07 12:12:04 -04:00
Brad King 1167360b99 Tests: Fix RunCMake.GeneratorExpression to run in CMake 3.9
CMake 3.9 does not have CMP0070, so port away from it for that branch.
2017-09-07 12:08:34 -04:00
Sebastian Holtermann 6739a12571 Autogen: Doc: Add Visual Studio PRE_BUILD note to cmake-qt.rst 2017-09-07 18:03:14 +02:00
Sebastian Holtermann 2be0acb71e Autogen: Tests: Add AUTOGEN_TARGET_DEPENDS test to mocDepends tests 2017-09-07 18:03:14 +02:00
Sebastian Holtermann 734d236c07 Autogen: Smarter target dependency computation 2017-09-07 18:03:14 +02:00
Sebastian Holtermann 2e4dab087e Autogen: Set CM_DISABLE_COPY in cmQtAutoGenerators 2017-09-07 18:03:14 +02:00
Sebastian Holtermann c330d641af Autogen: Replace CM_AUTO_PTR with std::unique_ptr 2017-09-07 18:03:14 +02:00
Sebastian Holtermann 9468e926b0 Autogen: Refactor logging 2017-09-07 18:03:13 +02:00
Sebastian Holtermann 2ba1b28122 Autogen: More use of scoped lambdas 2017-09-07 18:03:13 +02:00
Sebastian Holtermann 0f9080e235 Autogen: More use of scoped lambdas 2017-09-07 18:03:13 +02:00
Sebastian Holtermann d561c1fffc Autogen: More use of scoped lambdas 2017-09-07 18:03:13 +02:00
Sebastian Holtermann db80367c91 Autogen: Use scoped lambdas intead of named functions 2017-09-07 17:53:19 +02:00
Sebastian Holtermann ed216b32a5 Autogen: Touch moc_predefs.h when it's content didn't change 2017-09-07 17:53:19 +02:00
Sebastian Holtermann f23a24c287 Autogen: Use list of lists functions for UIC options 2017-09-07 17:53:19 +02:00
Sebastian Holtermann 37ef18a468 Autogen: Pass RCC build names and function names in info file
- The output file name of the `rcc` command get computed once
  in the AUTOGEN initializer and is passed in the info file.

- The function name for the `-name` option of `rcc` gets computed
  once in the AUTOGEN initializer and is passed along with the
  other `rcc` options in the info file.
2017-09-07 17:53:19 +02:00
Sebastian Holtermann 761b3d7974 Autogen: Add functions to read/write a list of lists 2017-09-07 17:53:19 +02:00
Sebastian Holtermann 84658539bc Autogen: Use single KeyRegExp filter struct 2017-09-07 17:53:19 +02:00
Sebastian Holtermann d8d064abbc Autogen: Use the same algorithm for RCC and UIC option merging 2017-09-07 17:53:19 +02:00
Sebastian Holtermann 37714f884b Autogen: Replace cmsys::SystemTools:: with cmSystemTools:: 2017-09-07 17:53:19 +02:00
Sebastian Holtermann d1e5eb8497 Autogen: Iterate source files only once
This is a large commit that serves multiple purposes

- Iterate source files only once and store all extracted
  information in a cmQtAutogenDigest class that can be reused.
  This is brings speed improvements because several properties
  are only evaluated once. More that that it helps to avoid
  duplication of code with non trivial files property checks.
- Fix the Visual Studio generator to use PRE_BUILD when possible.
- Convert `for( ... )` loops to C++11 range base loops where possible
  (cmQtAutogen*.cxx only).
- String concatenation optimizations.
2017-09-07 17:53:18 +02:00
Brad King 25ac91a715 Merge branch 'release-3.9' 2017-09-07 11:25:52 -04:00
Brad King 10a3835cbd Merge topic 'FindBoost-limit-configs'
e6159e18 FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1216
2017-09-07 11:23:00 -04:00