Commit Graph

37195 Commits

Author SHA1 Message Date
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
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
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 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
Brad King
14ea80ab0c Merge topic 'findexpat-importedtargets'
3a4f82e9 Help: Add notes for topic 'FindEXPAT-importedtargets'
bfe51369 FindEXPAT: Add unit test of target and variables
78f166f8 FindEXPAT: Add imported target and documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1207
2017-09-07 11:22:26 -04:00
Brad King
67a840b3c8 Merge topic 'irsl-vs15-future'
6dd0a593 Merge branch 'backport-irsl-vs15-future' into irsl-vs15-future
1dd2c08b InstallRequiredSystemLibraries: Add support for future VS 2017 toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christian Pfeiffer <cpfeiffer@live.de>
Merge-request: !1240
2017-09-07 11:17:33 -04:00
Kitware Robot
de80352d5b CMake Nightly Date Stamp 2017-09-07 00:01:07 -04:00
Roger Leigh
dbba53a5aa FindBoost: Add version 1.65.1 2017-09-06 21:11:47 +01:00
Brad King
05294a0916 Merge topic 'msvc2015-cxx17'
227e3535 MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1227
2017-09-06 13:25:48 -04:00
Deniz Bahadir
e6159e1842 FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs
With the use of options `Boost_USE_DEBUG_LIBS` and
`Boost_USE_RELEASE_LIBS` it is now possible to skip searching for either
DEBUG or RELEASE Boost libraries.
This is useful if Boost is installed on the system in multiple
directories but only one of them should be used which only contains e.g.
the RELEASE libraries. Without this change the DEBUG libraries might be
found in the other directory which might not be desired at all.
2017-09-06 17:58:45 +02:00
Brad King
80420d3c01 Merge branch 'backport-irsl-vs15-future' into release-3.9
Merge-request: !1240
2017-09-06 11:47:50 -04:00
Brad King
6dd0a593d9 Merge branch 'backport-irsl-vs15-future' into irsl-vs15-future 2017-09-06 11:37:30 -04:00
Brad King
1dd2c08b19 InstallRequiredSystemLibraries: Add support for future VS 2017 toolchains
Assume that all cl 19.xx versions will use the same runtime DLL pattern.

Suggested-by: Tomasz Słodkowicz <slodki@users.noreply.github.com>
2017-09-06 11:36:47 -04:00
Brad King
c6f9c6f67a Merge branch 'release-3.9' 2017-09-06 10:50:35 -04:00
Brad King
354835bd73 Merge topic 'static_cast'
353ec237 use static_cast<> for casts from void*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1225
2017-09-06 10:48:44 -04:00
Brad King
ff0847b2d5 Merge topic 'FindBoost-fix-policy-scope'
ade45fa3 FindBoost: Revert "Simplify search in lists."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1238
2017-09-06 10:47:49 -04:00
Brad King
e4a78435c1 Merge topic 'findopenmp-found'
91fbda82 FindOpenMP: Restore OpenMP_FOUND result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1233
2017-09-06 10:47:31 -04:00
Brad King
faacd46d39 Merge topic 'android-ndk-r16'
5a1a1177 Android: Update for NDK r16

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Seither <d@fdseither.de>
Merge-request: !1237
2017-09-06 10:46:38 -04:00
Brad King
932ba44f07 Merge topic 'csharp_fix_initial_flags'
a3388900 VS: Initialize CSharp flags consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1232
2017-09-06 10:46:11 -04:00
Brad King
70a2a5d1e0 Merge topic 'vs-csharp-ref-no-asm'
94e70e53 Merge branch 'backport-vs-csharp-ref-no-asm' into vs-csharp-ref-no-asm
7e57e6ae VS: Do not reference output assemblies if not possible for CSharp target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1203
2017-09-06 10:45:38 -04:00