summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Fix processing of -Wno-error= flagsBrad King2020-11-172-3/+12
| | | | | Fix two bugs that happened to cancel each other out for cases covered by our test suite. Add a test case that distinguishes them.
* Merge topic 'cmake-build-specify-makefile-name'Brad King2020-11-173-0/+18
|\ | | | | | | | | | | | | | | cfce067b3f Tests: Add RunCMake.Make case for conflicting Makefile names 378c047ae3 Makefiles: Explicitly tell 'make' tool what Makefile name to use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5509
| * Tests: Add RunCMake.Make case for conflicting Makefile namesBrad King2020-11-162-0/+13
| | | | | | | | Issue: #21418
| * Makefiles: Explicitly tell 'make' tool what Makefile name to useOliver Schneider2020-11-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake did not specify the filename of the Makefile generated by it. Due to GNU make precedence rules this means that the presence of a GNUmakefile or makefile would take precedence over the generated Makefile. This is only relevant for in-source builds and only whenever an alternative makefile by the above mentioned names exists. This patch adds the (seemingly universal) `-f` switch and the (hardcoded) filename (it is now hardcoded separately in these two files): - cmLocalUnixMakefileGenerator3.cxx - cmGlobalUnixMakefileGenerator3.cxx Fixes: #21418
* | Merge topic 'cpack-deb-no-dbgsyms'Brad King2020-11-174-2/+15
|\ \ | | | | | | | | | | | | | | | | | | c826745f5a CPack/DEB: Do not crash when asked for debug symbols when there are none Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5443
| * | CPack/DEB: Do not crash when asked for debug symbols when there are noneAndrew Fuller2020-11-164-2/+15
| |/ | | | | | | Fixes: #21356
* | Merge topic 'pch-header-not-generated'Brad King2020-11-171-6/+8
|\ \ | | | | | | | | | | | | | | | | | | 7524501d89 PCH: Do not mark PCH-header as generated Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5510
| * | PCH: Do not mark PCH-header as generatedDeniz Bahadir2020-11-161-6/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The PCH header file itself is written by CMake and is not generated by part of the buildsystem. Therefore the `GENERATED` property is not appropriate to set because the file is always present before the build starts. We already do not mark the PCH source file as `GENERATED` either. This is a preparation for solving #18399, which will no longer allow to unset the `GENERATED` property from a source-file once it was set. Fixes: #21437 Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
* | Merge branch 'release-3.19'Brad King2020-11-170-0/+0
|\ \
| * \ Merge topic 'msvc-14.28' into release-3.19Brad King2020-11-171-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5512
* | \ \ Merge topic 'msvc-14.28'Brad King2020-11-171-0/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5512
| * | | Suppress MSVC 14.28 C5105 warning triggered by Windows SDKBrad King2020-11-171-0/+6
| |/ / | | | | | | | | | Issue: #21446
* | | CMake Nightly Date StampKitware Robot2020-11-171-1/+1
| | |
* | | Merge branch 'release-3.19'Craig Scott2020-11-160-0/+0
|\ \ \ | |/ /
| * | Merge topic 'xcode-clean-lib-paths' into release-3.19Craig Scott2020-11-161-10/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5511
* | \ \ Merge topic 'xcode-clean-lib-paths'Craig Scott2020-11-161-10/+20
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5511
| * | Xcode: Clean library paths to avoid linker duplicate symbol definitionsGusts Kaksis2020-11-151-10/+20
| | |
* | | Merge topic 'msvc-no-GR'Brad King2020-11-1612-4/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c00a6d3967 MSVC: Do not add /GR to CMAKE_CXX_FLAGS by default 6114c8e994 MSVC: Factor out initialization of /GR flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5508
| * | | MSVC: Do not add /GR to CMAKE_CXX_FLAGS by defaultBrad King2020-11-1312-1/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `/GR` flag has been on by default since MSVC cl 14.0 from VS 2005. Remove it from the default flags to make it easier for projects to pass `/GR-` themselves to turn it off. Projects may be using string processing to replace `/GR` with another flag, so we cannot simply drop it. Add a policy to drop it in a compatible way. Fixes: #21428
| * | | MSVC: Factor out initialization of /GR flagBrad King2020-11-131-4/+8
| | | |
* | | | Merge branch 'release-3.19'Brad King2020-11-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'ci-fedora33' into release-3.19Brad King2020-11-1617-46/+63
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e35919e15 gitlab-ci: use Fedora 33 to build sources 061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33 bd62d2ecf3 ci: update to Fedora 33 for Linux builds ada3170625 ci: install gmock in the Fedora 31 image 86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9 6a83417908 clang-tidy: ignore new warnings from newer versions d2b648ec4c clang-tidy: ignore `misc-no-recursion` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5504
* | | | Merge topic 'ci-fedora33'Brad King2020-11-1617-46/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d1183c457 Merge branch 'ci-fedora33-release' into ci-fedora33 6e35919e15 gitlab-ci: use Fedora 33 to build sources 061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33 bd62d2ecf3 ci: update to Fedora 33 for Linux builds ada3170625 ci: install gmock in the Fedora 31 image 86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9 6a83417908 clang-tidy: ignore new warnings from newer versions d2b648ec4c clang-tidy: ignore `misc-no-recursion` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5504
| * \ \ \ Merge branch 'ci-fedora33-release' into ci-fedora33Ben Boeckel2020-11-1317-46/+61
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ci-fedora33-release: gitlab-ci: use Fedora 33 to build sources gitlab-ci: update Linux CI to use Fedora 33 ci: update to Fedora 33 for Linux builds ci: install gmock in the Fedora 31 image Tests/FindBoost/TestPython: support finding 3.8 and 3.9 clang-tidy: ignore new warnings from newer versions clang-tidy: ignore `misc-no-recursion`
| | * | | gitlab-ci: use Fedora 33 to build sourcesBen Boeckel2020-11-131-1/+1
| | | | |
| | * | | gitlab-ci: update Linux CI to use Fedora 33Ben Boeckel2020-11-1311-41/+41
| | | | |
| | * | | ci: update to Fedora 33 for Linux buildsBen Boeckel2020-11-134-2/+5
| | | | |
| | * | | ci: install gmock in the Fedora 31 imageBrad King2020-11-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gmock libraries are referenced by GTest's CMake package files. While at it, also explicitly install gettext. It is installed already, but make it explicit for future testing of the FindGettext module. (cherry picked from commit 585cc7c9301ff474a40d7702ce429b93f474d44f)
| | * | | Tests/FindBoost/TestPython: support finding 3.8 and 3.9Ben Boeckel2020-11-121-2/+2
| | | | |
| | * | | clang-tidy: ignore new warnings from newer versionsBen Boeckel2020-11-121-0/+11
| | | | | | | | | | | | | | | | | | | | These warnings can be fixed in the future, but are ignored for now.
| | * | | clang-tidy: ignore `misc-no-recursion`Ben Boeckel2020-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | CMake has intentional recursion in its codebase, so avoid warning about occurrences.
* | | | | CMake Nightly Date StampKitware Robot2020-11-161-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-11-151-1/+1
| | | | |
* | | | | Merge topic 'cmake_path-enhancements'Craig Scott2020-11-1417-209/+130
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed21ad181e cmake_path: various enhancements to subcommands/keywords Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5457
| * | | | | cmake_path: various enhancements to subcommands/keywordsMarc Chevrier2020-11-1117-209/+130
| | | | | | | | | | | | | | | | | | | | | | | | This change address partly the remarks done in issue #21385
* | | | | | CMake Nightly Date StampKitware Robot2020-11-141-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'usejava_helpers'Brad King2020-11-137-29/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb28d9af1f UseJava: Move helper scripts to subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5501
| * | | | | UseJava: Move helper scripts to subdirectoryNikita Nemkin2020-11-127-29/+7
| | | | | | | | | | | | | | | | | | | | | | | | Also, exclude them from the help module index.
* | | | | | Merge topic 'versionadded'Brad King2020-11-1340-149/+565
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c43e845d09 Help: Add `.. versionadded` directives to generator docs f6fd769ae9 Help: Add `.. versionadded` directives to CPack generator docs a19058d7d8 Help: Replace some `versionadded` directives with `versionchanged` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5495
| * | | | | | Help: Add `.. versionadded` directives to generator docsNikita Nemkin2020-11-1213-83/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More `.. versionadded` could be added later when the features, variables and properties relevant to each generator are properly documented. Issue: #19715
| * | | | | | Help: Add `.. versionadded` directives to CPack generator docsNikita Nemkin2020-11-1214-47/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #19715
| * | | | | | Help: Replace some `versionadded` directives with `versionchanged`Nikita Nemkin2020-11-1213-19/+19
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `.. versionchanged` directive might be more appropriate when documentation refers to previous CMake version, old behavior or a policy, and there's no new parameter or a variable involved. Issue: #19715
* | | | | | Merge topic 'android-abis'Brad King2020-11-131-61/+76
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a2bb717ee Android: load ABI information from abis.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5499
| * | | | | Android: load ABI information from abis.cmakeHaibo Huang2020-11-121-61/+76
| |/ / / / | | | | | | | | | | | | | | | | | | | | They are added to NDK and planned to release in r23: https://android-review.googlesource.com/c/platform/ndk/+/1493421
* | | | | Merge branch 'release-3.19'Brad King2020-11-130-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'qtifw-archivegen' into release-3.19Brad King2020-11-132-0/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab75dd7dd CPack/IFW: Locate the archivegen utility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5503
* | \ \ \ \ Merge topic 'qtifw-archivegen'Brad King2020-11-132-0/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab75dd7dd CPack/IFW: Locate the archivegen utility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5503
| * | | | | CPack/IFW: Locate the archivegen utilityErlend Egeberg Aasland2020-11-122-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21427
* | | | | | Merge branch 'release-3.19'Brad King2020-11-130-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'qtifw-4.0' into release-3.19Brad King2020-11-131-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63ae96a317 CPack/IFW: Add support for QtIFW 4.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5502