summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Don't RunCMake generate separable compilation tests on ClangRaul Tambre2020-06-031-15/+18
| | | | | | Building these targets was already previously disabled in RunCMakeTest.cmake. Now with us throwing an error for separable compilation during generation on Clang we also need to stop them from being generated.
* CUDA: Throw error if CUDA_SEPARABLE_COMPILATION is ON when using ClangRaul Tambre2020-06-021-0/+13
| | | | | Separable compilation isn't supported yet on Clang. Let's throw a helpful error instead of confusing errors during the build.
* Merge topic 'gitlab-ci-ninja-multi'Brad King2020-06-0212-31/+103
|\ | | | | | | | | | | | | | | | | | | | | e1b2c0108f gitlab-ci: add a Ninja Multi-Config test job 1e8ecfccdd gitlab-ci: also build ncurses and Qt code on Linux 95721f0a82 ci: install ncurses and Qt development into the Fedora 31 image ed2fe558b0 CursesDialog: resolve clang-tidy warnings 44f1744bed QtDialog: avoid using deprecated APIs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4832
| * gitlab-ci: add a Ninja Multi-Config test jobBen Boeckel2020-06-022-0/+35
| | | | | | | | This reuses the Ninja generator's tested build.
| * gitlab-ci: also build ncurses and Qt code on LinuxBen Boeckel2020-06-025-7/+11
| |
| * ci: install ncurses and Qt development into the Fedora 31 imageBen Boeckel2020-06-021-2/+4
| |
| * CursesDialog: resolve clang-tidy warningsBen Boeckel2020-06-024-22/+6
| | | | | | | | | | | | | | | | | | Fixes: - unnecessary bool expression (cmCursesMainForm) - removes a duplicate if/else branch (RegexExplorer) - collapses redundant if/else branch logic (CMakeSetupDialog and cmCursesStringWidget)
| * QtDialog: avoid using deprecated APIsBen Boeckel2020-06-022-0/+47
| |
* | Merge topic 'getdef-expand'Brad King2020-06-0216-137/+70
|\ \ | | | | | | | | | | | | | | | | | | 7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4819
| * | cmMakefile: add GetDefExpandList() that splits value into std::vectorVitaly Stakhovsky2020-05-3016-137/+70
| | | | | | | | | | | | Combines cmMakefile:GetDefinition() and cmExpandList()
* | | Merge topic 'doc-c-standard'Brad King2020-06-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e8958d4742 Help: Clarify that no version of MSVC today support C standard levels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4830
| * | | Help: Clarify that no version of MSVC today support C standard levelsHong Xu2020-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The current description sounds as if MSVC later than 2015 update 3 support C standard level, which is not true. This patch clarifies MSVC support.
* | | | Merge topic 'cmprop'Brad King2020-06-0261-28/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b36d1bdd9d Single location for cmProp typedef Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4829
| * | | | Single location for cmProp typedefVitaly Stakhovsky2020-06-0161-28/+62
| |/ / /
* | | | Merge topic 'UseSWIG-note-dep-strategy'Brad King2020-06-021-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f543b23a8 UseSWIG: note dependency behavior for Make generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4834
| * | | | UseSWIG: note dependency behavior for Make generatorsBen Boeckel2020-06-011-0/+8
| | | | | | | | | | | | | | | | | | | | See: #20067
* | | | | Merge topic 'macos-sdk-libraries'Brad King2020-06-021-5/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 444dbd40de Darwin: honour `CMAKE_OSX_SYSROOT` more faithfully Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4779
| * | | | | Darwin: honour `CMAKE_OSX_SYSROOT` more faithfullySaleem Abdulrasool2020-05-311-5/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The libraries in the SDK should be given precedence over the system libraries. Check for the default library search path (in default order) of `/usr/lib` and `/usr/local/lib` and use these as system prefix paths for libraries when performing the link step against a specified SDK.
* | | | | Merge topic 'target_link_libraries-self-link-is-an-error'Brad King2020-06-0212-1/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9436ad35df target_link_libraries: self-link through ALIAS is an error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4826
| * | | | | target_link_libraries: self-link through ALIAS is an errorMarc Chevrier2020-05-3012-1/+62
| |/ / / / | | | | | | | | | | | | | | | Fixes: #19617
* | | | | Merge topic 'getdef-nodups'Brad King2020-06-025-15/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 1e805f53f5 GetDefinition: avoid duplicate calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4824
| * | | | GetDefinition: avoid duplicate callsVitaly Stakhovsky2020-05-295-15/+14
| | | | |
* | | | | 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