summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'makefile-fix-verbose' into release-3.18Brad King2020-06-231-3/+4
|\ | | | | | | | | | | | | 7f78bc42cb Makefile: Fix regression in .SILENT rule Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4928
| * Makefile: Fix regression in .SILENT ruleDaniel Colascione2020-06-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d74e651b78 (Makefiles: Re-implement makefile target path escaping and quoting, 2020-04-10, v3.18.0-rc1~334^2~1), `WriteMakeRule` now correctly escapes `$` in make target paths as `$$`. However, this caused an existing call site to escape the `$(VERBOSE)` variable reference in the `.SILENT` prefix, making it ineffective. Sub-makefiles are invoked with `MAKESILENT`, so this bug matters only for the `all` target, which emits progress messages from toplevel. Before: # Suppress display of executed commands. $$(VERBOSE).SILENT: After: # Suppress display of executed commands. $(VERBOSE).SILENT:
* | try_compile: Do not try to remove '.nfs*' filesBrad King2020-06-171-1/+3
|/ | | | | | | These files are part of the NFS implementation and should not be removed. They will automatically disappear when NFS is done with them. Fixes: #20844
* CMake 3.18.0-rc2v3.18.0-rc2Brad King2020-06-171-1/+1
|
* CUDA: Add issue number to Clang separable compilation errorRaul Tambre2020-06-161-1/+2
|
* Merge topic 'cuda_clang_toolkit_path' into release-3.18Brad King2020-06-153-0/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
| * CUDA: Pass toolkit path to ClangRaul Tambre2020-06-123-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang isn't very good at finding the installed CUDA toolkit. The upstream recommendation is that we should pass the toolkit explicitly. Additionally: * Avoids Clang having to search for the toolkit on every invocation. * Allows the user to use a toolkit from a non-standard location by simply setting CUDAToolkit_ROOT. The same way as with FindCUDAToolkit. Clang wants the directory containing the device library and version.txt as the toolkit path. We thus pass the newly introduced CUDAToolkit_LIBRARY_ROOT as the toolkit path. We save CUDAToolkit_ROOT_DIR and CUDAToolkit_LIBRARY_ROOT on Clang to have them available in try_compile() and avoid unnecessary re-searching or a possibly different installation being found in FindCUDAToolkit. This however means that the selected toolkit can't be changed after the initial language enablement. We now determine CUDA compiler ID before doing actual detection, as we don't want to spend time finding the CUDA toolkit for NVIDIA. Implements #20754.
* | Merge topic 'cuda_architectures_disable' into release-3.18Brad King2020-06-151-22/+29
|\ \ | | | | | | | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
| * | CUDA: Add support for disabling CUDA_ARCHITECTURESRaul Tambre2020-06-151-22/+29
| |/ | | | | | | | | | | | | | | | | | | The ability to disable adding architectures completely for packaging purposes and cases requiring passing the architectures flags explicitly has been requested. Support a false value for CUDA_ARCHITECTURES and CMAKE_CUDA_ARCHITECTURES for this purpose. Implements #20821.
* | Merge topic 'revert-find_program-exe-no-read' into release-3.18Brad King2020-06-151-1/+1
|\ \ | |/ |/| | | | | | | | | cc02ced530 find_program: Revert "Find programs that are executable but not readable" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4871
| * find_program: Revert "Find programs that are executable but not readable"Brad King2020-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 86e6349ef7 (find_program: Find programs that are executable but not readable, 2020-04-04, v3.18.0-rc1~372^2) can break existing projects that were (likely accidentally) relying on the old behavior to find files that are readable but not executable. Revert the fix for now. We can re-introduce it with a policy later. Instead of reverting the test case, update it to cover the old behavior. That can serve as a reference for testing the policy when introduced. Fixes: #20814 Issue: #10468
* | 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.