summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Replace CM_AUTO_PTR with std::unique_ptrSebastian Holtermann2017-09-071-6/+5
|
* Autogen: Refactor loggingSebastian Holtermann2017-09-073-265/+373
|
* Autogen: More use of scoped lambdasSebastian Holtermann2017-09-071-35/+28
|
* Autogen: More use of scoped lambdasSebastian Holtermann2017-09-071-16/+11
|
* Autogen: More use of scoped lambdasSebastian Holtermann2017-09-072-118/+96
|
* Autogen: Use scoped lambdas intead of named functionsSebastian Holtermann2017-09-071-29/+26
|
* Autogen: Touch moc_predefs.h when it's content didn't changeSebastian Holtermann2017-09-071-0/+7
|
* Autogen: Use list of lists functions for UIC optionsSebastian Holtermann2017-09-073-49/+30
|
* Autogen: Pass RCC build names and function names in info fileSebastian Holtermann2017-09-075-185/+164
| | | | | | | | | - 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.
* Autogen: Add functions to read/write a list of listsSebastian Holtermann2017-09-072-0/+53
|
* Autogen: Use single KeyRegExp filter structSebastian Holtermann2017-09-072-26/+39
|
* Autogen: Use the same algorithm for RCC and UIC option mergingSebastian Holtermann2017-09-075-79/+90
|
* Autogen: Replace cmsys::SystemTools:: with cmSystemTools::Sebastian Holtermann2017-09-073-33/+33
|
* Autogen: Iterate source files only onceSebastian Holtermann2017-09-0711-659/+660
| | | | | | | | | | | | | | 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.
* Merge branch 'release-3.9'Brad King2017-09-070-0/+0
|\
| * Merge branch 'backport-irsl-vs15-future' into release-3.9Brad King2017-09-061-19/+16
| |\ | | | | | | | | | Merge-request: !1240
* | \ Merge topic 'FindBoost-limit-configs'Brad King2017-09-071-16/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e6159e18 FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1216
| * | | FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libsDeniz Bahadir2017-09-061-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'findexpat-importedtargets'Brad King2017-09-076-7/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Help: Add notes for topic 'FindEXPAT-importedtargets'Ben Morgan2017-09-011-0/+4
| | | | |
| * | | | FindEXPAT: Add unit test of target and variablesBen Morgan2017-09-014-0/+51
| | | | |
| * | | | FindEXPAT: Add imported target and documentationBen Morgan2017-09-011-7/+28
| | | | |
* | | | | Merge topic 'irsl-vs15-future'Brad King2017-09-071-19/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ Merge branch 'backport-irsl-vs15-future' into irsl-vs15-futureBrad King2017-09-061-19/+16
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | InstallRequiredSystemLibraries: Add support for future VS 2017 toolchainsBrad King2017-09-061-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume that all cl 19.xx versions will use the same runtime DLL pattern. Suggested-by: Tomasz Słodkowicz <slodki@users.noreply.github.com>
* | | | | | CMake Nightly Date StampKitware Robot2017-09-071-1/+1
| | | | | |
* | | | | | Merge topic 'msvc2015-cxx17'Brad King2017-09-061-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 227e3535 MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1227
| * | | | | MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3Nils Gladitz2017-09-011-1/+4
| | | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-09-060-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'FindBoost-fix-policy-scope' into release-3.9Brad King2017-09-051-9/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1238
| * \ \ \ \ \ Merge branch 'android-ndk-r16' into release-3.9Brad King2017-09-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1237
| * \ \ \ \ \ \ Merge branch 'csharp_fix_initial_flags' into release-3.9Brad King2017-09-052-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1232
| * \ \ \ \ \ \ \ Merge branch 'findopenmp-found' into release-3.9Brad King2017-09-051-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1233
| * \ \ \ \ \ \ \ \ Merge branch 'backport-vs-csharp-ref-no-asm' into release-3.9Brad King2017-09-056-0/+48
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1203
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix-genex-SOURCES' into release-3.9Brad King2017-09-016-1/+16
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1218
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'static_cast'Brad King2017-09-064-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 353ec237 use static_cast<> for casts from void* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1225
| * | | | | | | | | | | | use static_cast<> for casts from void*Rolf Eike Beer2017-09-014-6/+6
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'FindBoost-fix-policy-scope'Brad King2017-09-061-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ade45fa3 FindBoost: Revert "Simplify search in lists." Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1238
| * | | | | | | | | | | FindBoost: Revert "Simplify search in lists."Brad King2017-09-051-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.9.0-rc1~41^2 (FindBoost: Simplify search in lists, 2017-04-23). It regressed the module by exposing issue #17257, but the fix for that issue is not suitable for inclusion in a patch release. It is simplest to revert the commit until the larger problem can be addressed. Fixes: #17252
* | | | | | | | | | | | Merge topic 'findopenmp-found'Brad King2017-09-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91fbda82 FindOpenMP: Restore OpenMP_FOUND result variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1233
| * | | | | | | | | | | FindOpenMP: Restore OpenMP_FOUND result variableChristian Pfeiffer2017-09-051-0/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The overhaul in commit v3.9.0-rc1~207^2~1 (FindOpenMP: Complete overhaul, 2017-04-24) documented this variable but accidentally left it unset. Fixes: #17251
* | | | | | | | | | | Merge topic 'android-ndk-r16'Brad King2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a1a1177 Android: Update for NDK r16 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Seither <d@fdseither.de> Merge-request: !1237
| * | | | | | | | | | Android: Update for NDK r16Brad King2017-09-051-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since NDK commit 90ec78ffd96b87cd75d82575587ead14d6494df1 (Remove Clang toolchain path from setup.mk, 2017-05-31) the `setup.mk` files for Clang no longer hold the path to the `toolchains/llvm` directory. It has been the same since NDK r11, so use that as the default. Fixes: #17253
* | | | | | | | | | Merge topic 'csharp_fix_initial_flags'Brad King2017-09-062-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3388900 VS: Initialize CSharp flags consistently Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1232
| * | | | | | | | | VS: Initialize CSharp flags consistentlyMichael Stürmer2017-09-052-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same environment variable for the initial flags that we use for the compiler id. Fixes: #17250
* | | | | | | | | Merge topic 'vs-csharp-ref-no-asm'Brad King2017-09-066-0/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ Merge branch 'backport-vs-csharp-ref-no-asm' into vs-csharp-ref-no-asmBrad King2017-09-056-0/+48
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | VS: Do not reference output assemblies if not possible for CSharp targetMichael Stürmer2017-09-056-0/+48
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc4~4^2 (Vs: allow CSharp targets to be linked to CXX targets, 2017-06-20) CSharp targets get `ProjectReference` entries to their dependencies. This causes VS to also reference the dependency's output assembly by default, which is incorrect for non-managed targets. Fix this by setting `ReferenceOutputAssembly` to `false` for targets that can't provide output assemblies. Unmanaged C++ targets (shared libs & executables) can still be referenced and a warning will be shown in the IDE but the build will not break anymore. Fixes: #17172
* | | | | | | | CMake Nightly Date StampKitware Robot2017-09-061-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'ExternalProject-command'Brad King2017-09-054-0/+63
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15617484 ExternalProject: Prevent COMMAND from being treated as a true keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1178