summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QtDialog: avoid using deprecated APIsBen Boeckel2020-06-022-0/+47
|
* Merge topic 'asm-preprocessor-flag'Brad King2020-06-022-0/+2
|\ | | | | | | | | | | | | 97fa63c09b ASM: Fix preprocessor definition flags for GNU 'as' tool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4838
| * ASM: Fix preprocessor definition flags for GNU 'as' toolKyle Edwards2020-06-012-0/+2
| | | | | | | | Fixes: #20780
* | Merge topic 'test-fs-time-resolution'Brad King2020-06-022-2/+7
|\ \ | | | | | | | | | | | | | | | | | | 37bf7eb7a6 Tests: Skip RunCMake.try_compile RerunCMake-nowork case on 1s filesystems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4816
| * | Tests: Skip RunCMake.try_compile RerunCMake-nowork case on 1s filesystemsBrad King2020-06-012-2/+7
| |/ | | | | | | | | | | | | | | | | | | On low-resolution filesystems, `Makefile` can end up with the same time stamp as `CMakeCache.txt`. CMake must re-run in this case to be conservative, but that invalidates the `-nowork` cases. Rather than trying to detect 1s filesystems, just add an option called `CMake_TEST_FILESYSTEM_1S` that external scripts can use to tell CMake's test suite about this.
* | CMake Nightly Date StampKitware Robot2020-06-021-1/+1
|/
* Merge branch 'release-3.17'Brad King2020-06-010-0/+0
|\
| * Merge branch 'release-3.16' into release-3.17Brad King2020-06-010-0/+0
| |\
* | \ Merge branch 'release-3.16'Brad King2020-06-010-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.16.8v3.16.8Brad King2020-06-011-1/+1
| | |
* | | Merge topic 'fc-ep-git-update-strategy'Brad King2020-06-014-62/+94
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aa4d51ec5 ExternalProject: Add missing release note for git update strategy 1236590507 FetchContent: Pass through CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY if set e71c2807ba ExternalProject: Remote checkout needs to include the remote name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4818
| * | | ExternalProject: Add missing release note for git update strategyCraig Scott2020-05-291-0/+9
| | | | | | | | | | | | | | | | This release note was mistakenly omitted from commit 0aea435aa1 (ExternalProject: Provide choice of git update strategies, 2020-02-12).
| * | | FetchContent: Pass through CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY if setCraig Scott2020-05-291-6/+11
| | | | | | | | | | | | | | | | | | | | This was missed when the initial support was added in commit 0aea435aa1 (ExternalProject: Provide choice of git update strategies, 2020-02-12)
| * | | ExternalProject: Remote checkout needs to include the remote nameCraig Scott2020-05-292-56/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0aea435aa1 (ExternalProject: Provide choice of git update strategies, 2020-02-12) added the git update strategies, but the CHECKOUT strategy was not handling remote refs correctly. The local ref would be checked out instead and no warning or error would have been emitted. The test that should have caught this was also malformed and did not actually move the local master branch as intended.
* | | | Merge topic 'non-coverage-lines'Brad King2020-06-011-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed6d20ddcb CTest: Handle non-coverage lines in gcov files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4822
| * | | | CTest: Handle non-coverage lines in gcov filesTobias Ellinghaus2020-05-291-2/+8
| | | | | | | | | | | | | | | | | | | | This implements a TODO in gcov file handling.
* | | | | Merge topic 'cuda_user_architectures_nvcc'Brad King2020-06-011-19/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 650c1029a0 CUDA: Detect non-working user-specified architectures on NVCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4814
| * | | | | CUDA: Detect non-working user-specified architectures on NVCCRaul Tambre2020-05-291-19/+35
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the improved error message added for Clang by commit 19cc5bc296 (CUDA: Throw error if user-specified architectures don't work, 2020-05-26) to cover NVCC as well. Also fix the error incorrectly being thrown if the user-specified list differed in order to the architectures parsed from the compiler output. Implements: #20757
* | | | | Merge branch 'release-3.16'Brad King2020-06-010-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' into release-3.16Brad King2020-05-293-5/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4815
* | \ \ \ \ Merge branch 'release-3.17'Brad King2020-06-010-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'pch-fix-bad-ClearSourcesCache' into release-3.17Brad King2020-06-013-5/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4815
* | \ \ \ \ \ Merge topic 'pch-fix-bad-ClearSourcesCache'Brad King2020-06-013-5/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4815
| * | | | | | Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'Brad King2020-05-293-5/+22
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | PCH: Fix logic error that incorrectly clears sources during VS generationBrad King2020-05-293-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 729d997f10 (Precompile Headers: Add REUSE_FROM signature, 2019-08-30, v3.16.0-rc1~101^2), `GetPchFileObject` handles the case that it is called first for another target's `REUSE_FROM` by calling `AddSource` to make sure `GetObjectName` can produce the correct object name. However, `AddSource` causes `ClearSourcesCache` to be called, which since commit a9f4f58f0c (cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache, 2020-05-15, v3.16.7~2^2) now correctly erases the `AllConfigSources` structure. This is okay during `AddPchDependencies`, but there is another code path in which it is problematic. When the Visual Studio generator's `WriteAllSources` method is looping over the sources, the `cmake_pch.cxx` source is encountered first. This causes `OutputSourceSpecificFlags` to call `GetPchCreateCompileOptions`, which calls `GetPchFile`, which under MSVC with `CMAKE_LINK_PCH` calls `GetPchFileObject`. That leads to `ClearSourcesCache` erasing the structure over which `WriteAllSources` is iterating! This bug is caught by our `RunCMake.PrecompileHeaders` test when run with the VS generator as of the commit that exposed it by fixing `ClearSourcesCache`. However, that change was backported to the CMake 3.16 series after testing only with later versions versions that contain commit a55df20499 (Multi-Ninja: Add precompile headers support, 2020-01-10, v3.17.0-rc1~136^2). By adding proper multi-config support for PCH, that commit taught `cmLocalGenerator::AddPchDependencies` to call `GetPchFile` with the real set of configurations instead of just the empty string. This allows the `GetPchFile` cache of PCH sources to be populated up front so that the later calls to it in the `WriteAllSources` loop as described above do not actually call `GetPchFileObject` or `ClearSourcesCache`. That hid the problem. Fix this by re-ordering calls to `AddPchDependencies` to handle `REUSE_FROM` targets only after the targets whose PCH they re-use. Remove the now-unnecessary call to `AddSource` from `GetPchFileObject` so that `ClearSourcesCache` is never called during `WriteAllSources`. Update the PchReuseFrom test case to cover an ordering of targets that causes generators to encounter a `REUSE_FROM` target before the target whose PCH it re-uses. Fixes: #20770
* | | | | | | Merge branch 'release-3.17'Brad King2020-06-010-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'ninja-multi-export-all-symbols' into release-3.17Brad King2020-06-012-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Reinking <alex_reinking@berkeley.edu> Merge-request: !4825
* | \ \ \ \ \ \ Merge topic 'ninja-multi-export-all-symbols'Brad King2020-06-012-1/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Reinking <alex_reinking@berkeley.edu> Merge-request: !4825
| * | | | | | | Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLSKyle Edwards2020-05-292-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #20775
* | | | | | | CMake Nightly Date StampKitware Robot2020-06-011-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-311-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-301-1/+1
| | | | | | |
* | | | | | | Merge topic 'gitlab-ci-concurrency-tags'Brad King2020-05-291-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0eebd0a0e3 gitlab-ci: pin macOS and Windows jobs to nonconcurrent runners Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4823
| * | | | | | gitlab-ci: pin macOS and Windows jobs to nonconcurrent runnersBrad King2020-05-291-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS and Windows, our jobs use a `GIT_CLONE_PATH` that does not contain `$CI_CONCURRENCY_ID` so that the build and test jobs always use the same path. Since we use shell runners for these platforms, all concurrent jobs would use the same path and conflict. Therefore we can only use runners with a concurrency level of 1 for jobs in the `build` and `test` stages. However, jobs in the `test-ext` stage configure a new build tree for the tests and therefore can use `$CI_CONCURRENCY_ID` and support shell runners with higher concurrency levels. Prepare to make that distinction in the future by pinning all jobs to runners with a `nonconcurrent` tag.
* | | | | | Merge topic 'gitlab-ci-xcode-11.5'Brad King2020-05-291-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0508a80c1a gitlab-ci: update macOS jobs to Xcode 11.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4821
| * | | | | gitlab-ci: update macOS jobs to Xcode 11.5Brad King2020-05-291-2/+2
|/ / / / /
* | | | | Merge topic 'gitlab-ci-toolsets'Brad King2020-05-292-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d5a1fd6e2 gitlab-ci: pin windows and macos jobs to runners with matching toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4817
| * | | | | gitlab-ci: pin windows and macos jobs to runners with matching toolsetsBrad King2020-05-292-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toolsets available on machines hosting shell runners will evolve over time. Require the runners to have tags indicating that they have specific toolsets available. When toolsets are eventually removed from a runner, its tags can then be updated accordingly to prevent pipelines created for old commits from ever running on them.
* | | | | | Merge topic 'msbuild-utf8-disable'Brad King2020-05-291-2/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5058fb5401 VS: Drop StdOutEncoding with VS 16.6 pending investigation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4820
| * | | | | VS: Drop StdOutEncoding with VS 16.6 pending investigationBrad King2020-05-291-2/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `StdOutEncoding` added to `.vcxproj` files since commit bc877a7e94 (Add support to indicate UTF-8 custom command pipe output encoding, 2020-04-08) breaks custom commands with symbolic outputs on VS 16.6.0. Disable it pending further investigation and possibly a fix in VS. Issue: #20769
* | | | | Merge topic 'alias-cannot-overwrite-another-target'Brad King2020-05-2911-1/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1eca5993e2 ALIAS target: cannot overwrite an existing target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4810
| * | | | | ALIAS target: cannot overwrite an existing targetMarc Chevrier2020-05-2811-1/+100
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19616
* | | | | | Merge topic 'bugfix-gcev'Brad King2020-05-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d606b19f7d server-mode: Fix regression in cache entry reporting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4808
| * | | | | | server-mode: Fix regression in cache entry reportingVitaly Stakhovsky2020-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 0bf0e35e59 (cmCacheManager::GetProperty: return cmProp, 2020-03-19) changed the return type of GetCacheEntryValue. Update the server mode's call site accordingly.
* | | | | | | Merge branch 'release-3.17'Brad King2020-05-290-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'FindSubversion-xcode-removed' into release-3.17Brad King2020-05-291-2/+11
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4813
* | | | | | | Merge topic 'FindSubversion-xcode-removed'Brad King2020-05-291-2/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4813
| * | | | | | FindSubversion: Do not accept macOS stub without Xcode implementationBrad King2020-05-281-2/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Xcode no longer provides a `svn` implementation, but the `/usr/bin/svn` stub may still exist.
* | | | | | CMake Nightly Date StampKitware Robot2020-05-291-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'macos-pin-xcode-versions'Brad King2020-05-284-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35b29d3568 ci: disable java detection 72a7697901 gitlab-ci: pin macOS to a specific Xcode version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4812
generated by cgit v0.12 at 2025-01-04 02:54:54 (GMT)