summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CPack: Use SOURCE_DATE_EPOCH for all timestamps in archivesBen Stone2020-06-021-0/+5
|
* CMake Nightly Date StampKitware Robot2020-06-021-1/+1
|
* 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 'pch-fix-bad-ClearSourcesCache'Brad King2020-06-012-3/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-292-3/+17
| |\ \
| | * | PCH: Fix logic error that incorrectly clears sources during VS generationBrad King2020-05-292-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'ninja-multi-export-all-symbols'Brad King2020-06-011-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+2
| |/ / / | | | | | | | | | | | | Fixes: #20775
| * | | CMake 3.17.3v3.17.3Brad King2020-05-281-1/+1
| | | |
| * | | Merge topic 'ctest-repeat-notrun' into release-3.17Brad King2020-05-271-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4801
| * \ \ \ Merge topic 'ninja-multi-install' into release-3.17Brad King2020-05-253-5/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4778
* | | | | | 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
| |_|_|_|/ |/| | | |
* | | | | 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-292-1/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-291-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2020-05-2825-3005/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys c47501bcca KWSys 2020-05-27 (a3263389) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4804
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-05-2725-3005/+75
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-05-27 (a3263389)
* | | | | | Merge topic 'multi-ninja-pch-object-library'Brad King2020-05-282-95/+150
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f791eb160 Multi-Ninja: Fix reusable PCHs for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexej Harm <alexej.h@xiphos.de> Merge-request: !4787
| * | | | | | Multi-Ninja: Fix reusable PCHs for MSVCCristian Adam2020-05-272-95/+150
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #20721
* | | | | | CMake Nightly Date StampKitware Robot2020-05-281-1/+1
|/ / / / /
* | | | | Merge topic 'update-gitlab-links'Brad King2020-05-273-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb705b9531 Update links to gitlab.kitware.com repos to add `-/` Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4795
| * | | | | Update links to gitlab.kitware.com repos to add `-/`Brad King2020-05-263-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab now uses a `/-/` component between the `group/project` part of the URL and the `{issues,merge_requests,tree}` part so that it can support `group/subgroup/project` with arbitrary depth.
* | | | | | Merge topic 'cmState-unused-method'Brad King2020-05-271-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b837ab371 cmState: Drop unused and unimplemented SetCacheValue method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4797
| * | | | | | cmState: Drop unused and unimplemented SetCacheValue methodBrad King2020-05-261-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #20758
* | | | | | Merge topic 'automoc-after-generated-sources'Brad King2020-05-272-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f2702005a AutoMoc: Configure AutoMoc after generated sources (PCH, Unity) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4792
| * | | | | | AutoMoc: Configure AutoMoc after generated sources (PCH, Unity)Cristian Adam2020-05-262-5/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #20119
* | | | | | Merge topic 'cmake_language-check-invalid-commands'Brad King2020-05-271-0/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e483c563 cmake_language: check CALL with control command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4788
| * | | | | | cmake_language: check CALL with control commandMarc Chevrier2020-05-261-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20739
* | | | | | | Merge topic 'ctest-repeat-notrun'Brad King2020-05-271-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4801
| * \ \ \ \ \ \ Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrunBrad King2020-05-271-0/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | CTest: Make sure NOT_RUN tests show up in the failed test logRobert Maynard2020-05-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20543
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-271-1/+1
|/ / / / / /
* | | | | | CMake Nightly Date StampKitware Robot2020-05-261-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'fileApiAddPrecompileHeadersBacktrace'Brad King2020-05-253-2/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2 b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json 9c48804b69 PCH: Fix source group of per-architecture PCH headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4684
| * | | | | fileapi: Extend codemodel targets with PRECOMPILE_HEADERSJustin Goshi2020-05-222-1/+31
| | | | | |
| * | | | | PCH: Fix source group of per-architecture PCH headersBrad King2020-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f593b354da (PCH: Add support for multi architecture iOS projects, 2020-04-02) we forgot to update our regex that assigns PCH headers to the `Precompile Header File` source group to account for the `_<arch>` suffix that can now appear on their name.
* | | | | | Merge topic 'cuda-runtime-cleanup'Brad King2020-05-256-60/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcb44ac2ee CUDA: Simplify Clang implicit host linker settings 23519dd24f CUDA: Fix implicit runtime library filtering on Windows 16bed00712 CUDA: Refactor implicit library filtering 5c7ca6f8a8 CUDA: Move VS CudaRuntime selection to be with rest of CUDA options 4468acb979 CUDA: Factor runtime library lookup into helper method Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4776
| * | | | | | CUDA: Move VS CudaRuntime selection to be with rest of CUDA optionsBrad King2020-05-223-26/+11
| | | | | | |
| * | | | | | CUDA: Factor runtime library lookup into helper methodBrad King2020-05-224-42/+42
| | | | | | |
* | | | | | | Merge topic 'ninja-multi-install'Brad King2020-05-253-5/+42
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4778
| * | | | | | Ninja Multi-Config: Make "install" targets depend on default configsKyle Edwards2020-05-223-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add an "install:all" target. Fixes: #20713
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-251-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-241-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-231-1/+1
| | | | | | |