summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-lang-C' into release-3.18Brad King2020-06-121-3/+6
|\ | | | | | | | | | | | | 5c04e77e07 VS: Restore compilation of '.C' sources as C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4880
| * VS: Restore compilation of '.C' sources as C++Brad King2020-06-111-3/+6
| | | | | | | | | | | | | | | | | | Refactoring in commit 3b547e2e4b (VS: Simplify logic adding source file C/C++ language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) failed to account for MSVC's treatment of `.C` extensions as C. Add this special case to the logic to restore use of `-TP` for `.C` extensions. Fixes: #20822
* | QCMakeCacheView: use non-deprecated List and Set constructionsBen Boeckel2020-06-101-2/+15
|/
* CMake 3.18.0-rc1v3.18.0-rc1Brad King2020-06-091-1/+1
|
* cmGeneratorTarget: fix misplaced headerVitaly Stakhovsky2020-06-081-2/+1
| | | | | | In commit b36d1bdd9d (Single location for cmProp typedef, 2020-05-30) we accidentally left inclusion of `cmProperty.h` out of the main block of includes.
* Merge topic 'vs-add_package_reference_install' into release-3.18Brad King2020-06-081-1/+1
|\ | | | | | | | | | | | | 3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4854
| * VS: Enable DOTNET_TARGET_FRAMEWORK properties all target typesKinan Mahdi2020-06-051-1/+1
| | | | | | | | | | | | | | | | This makes them compatible with `VS_PACKAGE_REFERENCES` and, in particular, fixes nuget package references in combination with install targets. Fixes: #20764
* | CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compileBrad King2020-06-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e98588aaba (CUDA: Add CUDA_ARCHITECTURES target property, 2020-03-12), `CMAKE_CUDA_ARCHITECTURES` is both initialized and required by policy CMP0104's `NEW` behavior. Inside a `try_compile` project we use `cmake_minimum_required(VERSION ...)` with the current running version of CMake. Now that our version number is 3.18, `CMP0104` gets set to `NEW` in the `try_compile`. If the outer projects does not set the policy then `CMAKE_CUDA_ARCHITECTURES` is not available and the `try_compile` fails to generate. Teach `try_compile` to check the outer project's policy status and set policy CMP0104 to `OLD` if needed to match. Fixes: #20794
* | Begin 3.18 release versioningBrad King2020-06-051-3/+3
|/
* Merge topic 'reduce-try_compile'Brad King2020-06-051-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 9f3923893c libarchive: Map fixed-size integer types from KWIML as typedefs d20bf471c8 liblzma: Map fixed-size integer types from KWIML as typedefs 92c4316d81 KWSys: Hard-code try_compile results on Windows 2bc89f1a03 cmSystemTools: Hard-code try_compile results for Windows d350d4668a libarchive: Hard-code try_compile results for bundled dependencies bf60ac24ae Source: Assume elf.h does not exist on Windows f408cc2c40 expat: Remove unused try_compile checks 6c4f3dcd7b Utilities: Update hard-coded try_compile results for third-party libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4848
| * Source: Assume elf.h does not exist on WindowsBrad King2020-06-031-1/+3
| |
* | Merge topic 'msbuild-utf8-enable'Brad King2020-06-056-5/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | e219527a72 VS: Use StdOutEncoding for VS 16.7 Preview 3 and above 8a7ad923a8 VS: Extract instance version from VS Installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4847
| * | VS: Use StdOutEncoding for VS 16.7 Preview 3 and aboveJustin Goshi2020-06-034-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 16.6 added a `StdOutEncoding` setting for custom commands to tell MSBuild that the output is encoded as UTF-8. In commit bc877a7e94 (Add support to indicate UTF-8 custom command pipe output encoding, 2020-04-08) CMake learned to add the setting in anticipation of the VS 16.6 release. However, when 16.6 was released it had a bug in the implementation of custom tasks with StdOutEncoding enabled that was exposed by our test suite. In commit 5058fb5401 (VS: Drop StdOutEncoding with VS 16.6 pending investigation, 2020-05-29) we disabled the setting pending investigation. The problem is fixed in VS 16.7 Preview 3, so restore use of the setting when a VS instance of at least that version is detected. Fixes: #20769
| * | VS: Extract instance version from VS InstallerJustin Goshi2020-06-034-0/+23
| |/
* | Merge topic 'cuda_clang_separable_error'Brad King2020-06-051-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | b1243201e7 CUDA: Don't RunCMake generate separable compilation tests on Clang 1b4c690543 CUDA: Throw error if CUDA_SEPARABLE_COMPILATION is ON when using Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4827
| * | 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.
* | | CMake Nightly Date StampKitware Robot2020-06-051-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-06-041-1/+1
| |/ |/|
* | Merge topic 'imported-local-target-alias'Brad King2020-06-038-32/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | 056489d567 add_library/add_executable: allow local alias to imported targets 254f2b9058 Help: add_executable: Add TOC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4837
| * | add_library/add_executable: allow local alias to imported targetsMarc Chevrier2020-06-028-32/+71
| |/ | | | | | | Fixes: #20641
* | Merge topic 'cpack-archive-zip-timestamps'Brad King2020-06-031-0/+5
|\ \ | | | | | | | | | | | | | | | | | | c339e5380f CPack: Use SOURCE_DATE_EPOCH for all timestamps in archives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4842
| * | CPack: Use SOURCE_DATE_EPOCH for all timestamps in archivesBen Stone2020-06-021-0/+5
| | |
* | | Merge topic 'vs-sln-version-16'Brad King2020-06-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b69010b719 VS: Fix .sln support for VS Version Selector with VS 2019 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4844
| * | | VS: Fix .sln support for VS Version Selector with VS 2019Brad King2020-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | VS 2019 changed the naming pattern used by 2015 and 2017. Fixes: #20783
* | | | CMake Nightly Date StampKitware Robot2020-06-031-1/+1
| |_|/ |/| |
* | | Merge topic 'gitlab-ci-ninja-multi'Brad King2020-06-025-22/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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 '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 'target_link_libraries-self-link-is-an-error'Brad King2020-06-022-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-1/+11
| |/ / / / | | | | | | | | | | | | | | | 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
| | |/ / | |/| |
* | | | 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
| |_|_|_|/ |/| | | |
generated by cgit v0.12 at 2025-01-01 16:07:13 (GMT)