summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary arbitrary CollapseFullPath second argumentsBrad King2020-10-273-6/+3
| | | | | | | | | | Some calls to CollapseFullPath that already have an absolute path were updated by commit 22f38c0d6b (cmake: avoid getcwd in `CollapseFullPath`, 2020-01-14, v3.17.0-rc1~171^2) to pass an arbitrary second argument to prevent unnecessary `getcwd` calls. Since then, the KWSys implementation of CollapseFullPath has learned to avoid unnecessary `getcwd` calls on its own, so we can drop the arbitrary second arguments to our CollapseFullPath calls.
* Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\
| * Merge topic 'ci-config-sync' into release-3.19Brad King2020-10-274-21/+14
| |\ | | | | | | | | | | | | | | | | | | | | | e68d3e3b44 ci: update to Qt 5.15.1 d759c4310d ci: update to use CMake 3.18.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5433
* | \ Merge topic 'ci-config-sync'Brad King2020-10-274-21/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | e68d3e3b44 ci: update to Qt 5.15.1 d759c4310d ci: update to use CMake 3.18.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5433
| * | ci: update to Qt 5.15.1Ben Boeckel2020-10-272-16/+9
| | |
| * | ci: update to use CMake 3.18.4Ben Boeckel2020-10-272-5/+5
| |/
* | Merge branch 'release-3.18' into masterBrad King2020-10-270-0/+0
|\ \
| * \ Merge branch 'cuda_vs_skip_computation' into release-3.18Brad King2020-10-275-2/+21
| |\ \ | | | | | | | | | | | | Merge-request: !5422
* | \ \ Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'cuda_vs_skip_computation' into release-3.19Brad King2020-10-275-2/+21
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | dd77dec18d VS: Don't compute CUDA options unless necessary e9109dec36 Merge branch 'ninja-multi-per-config-sources' into release-3.18 7c0de4175b Merge branch 'cmake-E-cat-binary' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5422
* | | | Merge topic 'cuda_vs_skip_computation'Brad King2020-10-275-2/+21
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | dd77dec18d VS: Don't compute CUDA options unless necessary Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5422
| * | | VS: Don't compute CUDA options unless necessaryRaul Tambre2020-10-275-2/+21
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the following scenario (with 3.18 policies): 1. A CXX target is created. 2. CUDA language is enabled. CMake 3.18 introduced CMP0104, which requires CUDA_ARCHITECTURES to be set. Because the CXX target was created before CUDA was enabled it wouldn't have it set. The Visual Studio generator would however end up computing CUDA compile options for the CXX target, which would result in a fatal error due to the policy violation. There doesn't seem to be a reason to do this for targets that don't actually use the CUDA language, so we can skip and generate the CXX target just fine. Fixes: #21341
* | | Merge branch 'release-3.19'Craig Scott2020-10-270-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'cmake-presets-path-arg' into release-3.19Craig Scott2020-10-2715-32/+65
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | b7d7eca66d CMakePresets.json: Rework how --preset argument is handled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5416
* | \ \ Merge topic 'cmake-presets-path-arg'Craig Scott2020-10-2715-32/+65
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | b7d7eca66d CMakePresets.json: Rework how --preset argument is handled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5416
| * | | CMakePresets.json: Rework how --preset argument is handledKyle Edwards2020-10-2615-32/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a path argument with no -S or -B leads to a cache directory, use that directory as the binary directory. Otherwise, use the binary directory from the preset. Fixes: #21311
* | | | Merge topic 'cmake-20866'Brad King2020-10-2730-28/+266
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03ad0e61c1 configure_file: Add option for user defined permissions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5320
| * | | | configure_file: Add option for user defined permissionsAsit Dhal2020-10-2430-28/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User defined permissions and options to copy permissions are implemented. Fixes: #20866
* | | | | Merge topic 'issue-21034'Brad King2020-10-2716-11/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a3d125de8 target_sources: Support custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5421
| * | | | | target_sources: Support custom targetsAsit Dhal2020-10-2416-11/+80
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21034
* | | | | | Merge topic 'issue-19696'Brad King2020-10-277-0/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c75d68a2af genex: improve unit testing for $<TARGET_NAME_IF_EXISTS:...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5420
| * | | | | | genex: improve unit testing for $<TARGET_NAME_IF_EXISTS:...>Asit Dhal2020-10-247-0/+34
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #19696
* | | | | | Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'correct_msvc_cuda_flag_warning' into release-3.19Brad King2020-10-271-4/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5423
* | \ \ \ \ \ Merge topic 'correct_msvc_cuda_flag_warning'Brad King2020-10-271-4/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5423
| * | | | | | CUDA: Use MSVC version to determine supported C++ standard levelsRobert Maynard2020-10-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21335
* | | | | | | Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'check-module-name-conflicts' into release-3.19Brad King2020-10-2723-356/+386
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d192918586 Modules: Do not implicitly add new functions via old Check Modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5424
* | \ \ \ \ \ \ Merge topic 'check-module-name-conflicts'Brad King2020-10-2723-356/+386
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d192918586 Modules: Do not implicitly add new functions via old Check Modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5424
| * | | | | | | Modules: Do not implicitly add new functions via old Check ModulesRobert Maynard2020-10-2623-356/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conversion of Check<Lang>CompilerFlag, SourceCompiles, and SourceRuns over to the new functions has the possibility of breaking projects that had functions with those existing names. To reduce the possibility of collisions we now have all the legacy code call functions that start with `cmake_`, and users will need to explicitly include the new modules to get the non-prefixed versions Fixes: #21359
* | | | | | | | Merge branch 'release-3.18' into masterBrad King2020-10-270-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'ninja-multi-per-config-sources' into release-3.18Brad King2020-10-263-1/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5430
* | \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ninja-multi-per-config-sources' into release-3.19Brad King2020-10-273-1/+15
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8937a992b Merge branch 'release' into ninja-multi-per-config-sources d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5430
* | | | | | | | | Merge topic 'ninja-multi-per-config-sources'Brad King2020-10-273-1/+15
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8937a992b Merge branch 'release' into ninja-multi-per-config-sources d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5430
| * | | | | | | | Merge branch 'release' into ninja-multi-per-config-sourcesKyle Edwards2020-10-263663-16910/+57048
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Ninja Multi-Config: Don't try to calculate dependencies for "all"Kyle Edwards2020-10-263-1/+15
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-10-271-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'doc-CMAKE_BUILD_TYPE'Brad King2020-10-261-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb95d02252 Help: Document case insensitivity for CMAKE_BUILD_TYPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5411
| * | | | | | | | Help: Document case insensitivity for CMAKE_BUILD_TYPEChristopher Tetreault2020-10-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of CMAKE_BUILD_TYPE is case insensitive. Furthermore, the actual value of the variable will have the same casing as the user specifies on the command line.
* | | | | | | | | Merge topic 'ExternalData-suppress-progress'Brad King2020-10-265-2/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae7c81c622 ExternalData: add support for suppressing progress during the build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5413
| * | | | | | | | | ExternalData: add support for suppressing progress during the buildBen Boeckel2020-10-235-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During CI builds (at least), download progress is just noise. Allow it to be suppressed. Default to `OFF` for Ninja due to the tool's behavior of not showing output until a command is complete (which makes any progress reporting of little use) and `ON` otherwise.
* | | | | | | | | | Merge topic 'android-find_path'Brad King2020-10-261-0/+74
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7f41a7ee4 Android: Fix find_* search order within NDK for unified toolchains 5cdf37e4cc Android: Root searches within the NDK for unified toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5357
| * | | | | | | | | | Android: Fix find_* search order within NDK for unified toolchainsHaibo Huang2020-10-231-0/+36
| | | | | | | | | | |
| * | | | | | | | | | Android: Root searches within the NDK for unified toolchainsHaibo Huang2020-10-231-0/+38
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `CMAKE_FIND_ROOT_PATH_MODE_*` appropriately.
* | | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'correct_profiling-output_exception' into release-3.19Brad King2020-10-261-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afac7482d2 cmake: command arguments which use '=' behave consistently Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5414
* | \ \ \ \ \ \ \ \ \ Merge topic 'correct_profiling-output_exception'Brad King2020-10-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afac7482d2 cmake: command arguments which use '=' behave consistently Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5414
| * | | | | | | | | | cmake: command arguments which use '=' behave consistentlyRobert Maynard2020-10-231-3/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21351 The `profiling-format`, `profiling-output`, and `preset` all would crash when invoked without a trailing `=`.
* | | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
generated by cgit v0.12 at 2025-09-07 11:22:26 (GMT)