summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'backport-3.16-vs-v142-version' into release-3.16Brad King2019-12-132-12/+18
|\ | | | | | | | | | | | | | | | | 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+ 07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4133
| * Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-versionBrad King2019-12-120-0/+0
| |\
| | * VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-122-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.15.5~6^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
| * | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-122-12/+18
|/ / | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.16.0-rc1~32^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
* | CMake 3.16.1v3.16.1Brad King2019-12-101-1/+1
| |
* | Merge topic 'wxwidgets_macos_weakframework' into release-3.16Brad King2019-12-101-0/+2
|\ \ | | | | | | | | | | | | | | | | | | ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
| * | FindwxWidgets: Add support for 3.1.3 on macOSTobias Taschner2019-12-101-0/+2
| | | | | | | | | | | | Previously only -framework was used starting with 3.1.3 -weak_framework might also be used and has to be handled.
* | | Merge topic 'toc_on_ppc' into release-3.16Brad King2019-12-104-4/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc b35926e260 Check for support before adding bigtoc linker flag 958f858ad8 Check for support before adding bigtoc linker flag 8c7b7df788 bootstrap: Add target_link_options command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4122
| * \ \ Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppcBrad King2019-12-090-0/+0
| |\ \ \
| | * | | Check for support before adding bigtoc linker flagAlexander Grund2019-12-092-2/+35
| | | |/ | | |/| | | | | | | | | Fixes: #20076
| * | | Check for support before adding bigtoc linker flagAlexander Grund2019-12-092-2/+39
| | | | | | | | | | | | | | | | Fixes: #20076
| * | | bootstrap: Add target_link_options commandAlexander Grund2019-12-092-2/+3
| | |/ | |/|
* | | Merge topic 'unity-object-libraries' into release-3.16Brad King2019-12-096-8/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa93b4a59b Unity: Proper handling of object libraries 5ae07e7166 Unity: Generic source file handling for all generators f742f7ac1f Unity/PCH: Skip more target types when adding automatic sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4110
| * | | Unity: Proper handling of object librariesCristian Adam2019-12-075-0/+31
| | | | | | | | | | | | | | | | Fixes: #20051
| * | | Unity: Generic source file handling for all generatorsCristian Adam2019-12-072-7/+2
| | | |
| * | | Unity/PCH: Skip more target types when adding automatic sourcesCristian Adam2019-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | Besides INTERFACE_LIBRARY, skip also UTILITY and GLOBAL_TARGET target types
* | | | Merge topic 'pch-reuse-importlib' into release-3.16Brad King2019-12-094-1/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93becd61d1 PCH: Use the target's PREFIX for building the pdb file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4114
| * | | | PCH: Use the target's PREFIX for building the pdb file nameCristian Adam2019-12-084-1/+49
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also copy the REUSE_FROM pdb file only if the file is newer than the existing one. Fixes: #19731 Fixes: #20068
* | | | Merge topic 'clang-analyzer-ignore-strcpy' into release-3.16Brad King2019-12-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 677097ac1d TestDriver: ignore strcpy call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4116
| * | | | TestDriver: ignore strcpy callBen Boeckel2019-12-051-1/+1
| | |/ / | |/| | | | | | | | | | | | | | clang-analyzer has a check for any use of `strcpy`. This usage is safe because it is allocated above using the length of the string.
* | | | Merge topic 'FindThreads-lib-flag' into release-3.16Brad King2019-12-051-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4112
| * | | | FindThreads: Restore hard-coded '-l' flag on library nameBrad King2019-12-041-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit de5f123d3a (FindThreads: Do not hard-code '-l' flag on library name, 2019-09-23, v3.16.0-rc1~71^2). Some clients depend on the value of `CMAKE_THREAD_LIBS_INIT` to contain a valid flag. Fixes: #20061, #20065
* | | | Merge topic 'pch-xcode-no-warning' into release-3.16Brad King2019-12-052-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df8372da09 PCH: Do not add #pragma system_header for Xcode generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4098
| * | | | PCH: Do not add #pragma system_header for Xcode generatorCristian Adam2019-12-042-2/+6
| |/ / / | | | | | | | | | | | | Fixes: #20039
* | | | Merge topic 'ctest-spec-file-version-test' into release-3.16Kyle Edwards2019-11-282-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 59df85194e CTest Resource Allocation: Add test for spec file with no version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4092
| * | | CTest Resource Allocation: Add test for spec file with no versionKyle Edwards2019-11-262-0/+5
|/ / /
* | | CMake 3.16.0v3.16.0Brad King2019-11-261-1/+1
| | |
* | | Merge topic 'ctest-resource-fixes' into release-3.16Brad King2019-11-2647-2/+282
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified a64ba0235f CTest: Clarify that resource requirements can be split f9f294f5fa CTest: Add version field to resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4080
| * | Help: Clarify how tests are run if no resource spec file is specifiedKyle Edwards2019-11-261-0/+17
| | | | | | | | | | | | Fixes: #19985
| * | CTest: Clarify that resource requirements can be splitKyle Edwards2019-11-2510-2/+41
| | | | | | | | | | | | | | | | | | | | | Add a note to the documentation to clarify this, and add test cases to ensure it. Fixes: #19987
| * | CTest: Add version field to resource spec fileKyle Edwards2019-11-2537-0/+224
| | | | | | | | | | | | Fixes: #20007
* | | Merge topic 'implicit-includes-extra-CR' into release-3.16Brad King2019-11-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 2a5e5b25ba CMake 3.15.5 08173075c1 Merge branch 'doc-genex-tweak' into release-3.15 83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15 dec3e9363e Merge branch 'backport-vs-16.4-global-targets' into release-3.15 ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
| * \ \ Merge branch 'backport-implicit-includes-extra-CR' into ↵Brad King2019-11-261-1/+1
| |\ \ \ | | | | | | | | | | | | | | | implicit-includes-extra-CR
| | * | | CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler outputBrad King2019-11-251-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | With Clang/LLVM on MinGW, lines ending in `\r\r\n` have been observed. Filter out all `\r` characters from these line endings. Fixes: #20021
| | * | CMake 3.15.5v3.15.5Brad King2019-10-301-1/+1
| | | |
| | * | Merge branch 'doc-genex-tweak' into release-3.15Brad King2019-10-211-1/+1
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !3939
| | * \ \ Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15Brad King2019-10-111-0/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3909
| | * \ \ \ Merge branch 'vs-v142-csharp-flags' into release-3.15Brad King2019-10-112-2/+575
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3908
| | * \ \ \ \ Merge branch 'backport-vs-16.4-global-targets' into release-3.15Brad King2019-10-071-0/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3896
| | | * | | | | VS: Tell VS 16.4 not to verify CMake-provided custom command outputsBrad King2019-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated. Fixes: #19737
* | | | | | | | Merge topic 'FindODBC-mingw' into release-3.16Brad King2019-11-261-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
| * | | | | | | | FindODBC: Add library name for MinGW toolchainsCristian Adam2019-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20018
* | | | | | | | | Merge topic 'unity-no-duplicate-path' into release-3.16Brad King2019-11-261-13/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43ffd2c35c Unity: No repeated path for internal generated unity files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4077
| * | | | | | | | Unity: No repeated path for internal generated unity filesCristian Adam2019-11-251-13/+16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20002
* | | | | | | | Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16Brad King2019-11-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4079
| * | | | | | | FindwxWidgets: Fix finding both release and debug libsBrad King2019-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) the internal `WX_FIND_LIBS` macro gained an argument but not all call sites were updated. Update the missing one now. Fixes: #20005
* | | | | | | | Merge topic 'xcode-objc' into release-3.16Brad King2019-11-211-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e68fb0c91 Xcode: Set source file type for Objective C/C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4073
| * | | | | | | | Xcode: Set source file type for Objective C/C++Brad King2019-11-201-0/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #19998
* | | | | | | | Merge topic 'FindwxWidgets-qt-debug' into release-3.16Brad King2019-11-211-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | 84408ff402 FindwxWidgets: Find wxQt debug libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4069
| * | | | | | FindwxWidgets: Find wxQt debug librariesCraig Sturdy2019-11-201-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) to also find debug-enabled libs.