summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | CMake 3.16.0-rc4v3.16.0-rc4Brad King2019-11-181-1/+1
| | | | | |
* | | | | | Merge topic 'swift-rpath-darwin' into release-3.16Brad King2019-11-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4059
| * | | | | | Swift: support `-rpath` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Darwin also has the concept of RPATH. Additionally, the flag is identical to that on other Unixish platforms. Simply avoid the `-rpath` handling on Windows. This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH` with Swift targets on Darwin.
* | | | | | | Merge topic 'swift-darwin-install-name' into release-3.16Brad King2019-11-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4060
| * | | | | | | Swift: support `INSTALL_NAME_DIR` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the shared object rule to ensure that we honour the `INSTALL_NAME_DIR` property on Swift targets. This enables the use of `INSTALL_NAME_DIR` and `BUILD_WITH_INSTALL_NAME_DIR` on Darwin with Ninja.
* | | | | | | | Merge topic 'compile-features-other-lang' into release-3.16Brad King2019-11-181-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4057
| * | | | | | | | Help: Clarify compile features handling for OBJC and OBJCXXCraig Scott2019-11-171-1/+6
| | | | | | | | |
* | | | | | | | | Merge topic 'cpack-custom-templates' into release-3.16Brad King2019-11-186-9/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6ab5dc5b CPack: Restore support for custom package configuration templates Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4054
| * | | | | | | | | CPack: Restore support for custom package configuration templatesBrad King2019-11-156-9/+18
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to `Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally changed the public-facing names of the templates. The name passed to `FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change. Remove the `Internal/CPack/` prefix on the names added by that commit. Teach `FindTemplate` to use our builtin default directly when the public-facing name is not found in `CMAKE_MODULE_PATH`. Fixes: #19979
* | | | | | | | | Merge topic 'docs-pch-reorg' into release-3.16Brad King2019-11-182-49/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers() dae9a808fe Help: Reorganise target_precompile_headers() docs for readability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4045
| * | | | | | | | | Help: Provide guidance on INTERFACE for target_precompile_headers()Craig Scott2019-11-132-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19953
| * | | | | | | | | Help: Reorganise target_precompile_headers() docs for readabilityCraig Scott2019-11-131-49/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporates clarification of behavior when trying to specify REUSE_FROM on a target that already has its own precompile headers set. Fixes: #19970
* | | | | | | | | | Merge topic 'pch-reuse-no-prop' into release-3.16Brad King2019-11-184-11/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4046
| * | | | | | | | | | PCH: Do not issue an error on duplicate target_precompile_headers callCristian Adam2019-11-154-11/+22
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19970
* | | | | | | | | | Merge topic 'tutorial-replace-unicode-dash' into release-3.16Craig Scott2019-11-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4058
| * | | | | | | | | Tutorial: replace Unicode EN DASH with ASCII dashArkadiusz Drabczyk2019-11-171-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unicode EN DASH is problematic: - it cannot be easily found in web browsers, editors etc. - it doesn't work when copied and run in the terminal