summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Inherit target library and framework search paths from projectGusts Kaksis2020-11-051-0/+4
| | | | | | | | | | | | | | | | Xcode has multiple levels of build settings with priority in descending order: 1. Target 2. Project 3. Workspace 4. SDK defaults `CMAKE_XCODE_ATTRIBUTE_*` path variables add these to project level, but linked frameworks and libraries override this in target level. Add the `$(inherited)` macro to keep both in the final list. Fixes: #21387
* Merge topic 'cmake_path-deactivation' into release-3.19Brad King2020-11-0412-866/+8
|\ | | | | | | | | | | | | 1c912056a1 cmake_path: remove new command from 3.19 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5459
| * cmake_path: remove new command from 3.19Marc Chevrier2020-11-0312-866/+8
|/ | | | | | | Defer adding this command until post-3.19 development so that it has more time to mature before being included in a release. Issue: #21385
* Merge topic 'cmake-presets-no-path-arg-warning' into release-3.19Brad King2020-11-034-1/+22
|\ | | | | | | | | | | | | cb2d01c182 CMakePresets.json: Don't warn if no path argument is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5455
| * CMakePresets.json: Don't warn if no path argument is givenKyle Edwards2020-11-024-1/+22
| | | | | | | | | | | | | | | | | | If --preset is specified with no path argument, use the current directory as the source directory, the preset's binaryDir as the binary directory, and don't issue the standard warning for no path specified. Fixes: #21386
* | Merge topic 'fix-cuda-qnx' into release-3.19Brad King2020-11-034-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0832516bec Help: Add 3.19 release note about CUDA support on QNX bcdd486bf7 CUDA: Enable support on QNX Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5446
| * | Help: Add 3.19 release note about CUDA support on QNXBrad King2020-11-021-0/+2
| | |
| * | CUDA: Enable support on QNXjanbernloehr2020-11-023-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following two issues with the CUDA support on QNX: * cuda target name is not derived correctly (should be `aarch64-qnx`). * linking `cudart` must not be linked against `rt`, `dl`, `pthread`. This enables to use cmake's native cuda support on QNX. Fixes: #21381
* | | Merge topic 'doc-cpack-pre-post-scripts' into release-3.19Craig Scott2020-11-031-16/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b77dfa441f Help: Clarify variables specifying scripts to execute during packaging Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !5454
| * | | Help: Clarify variables specifying scripts to execute during packagingCraig Scott2020-11-031-16/+28
| | |/ | |/| | | | Relates: #19077
* | | Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-11-021-2/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5445
| * | FindBoost: Avoid leaking internal Boost_ROOT settingBrad King2020-10-301-2/+8
| |/ | | | | | | | | | | | | | | | | Since commit 4b2a61946f (FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig, 2020-10-22, v3.19.0-rc2~14^2) we accidentally leak our internal setting of `Boost_ROOT`. Revise the logic to unset our temporary value. Fixes: #21379
* | Merge topic 'CheckSourceRuns-compatibility' into release-3.19Brad King2020-10-307-3/+31
|\ \ | | | | | | | | | | | | | | | | | | a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5426
| * | CheckSourceRuns: do not fail on unrecognized argumentsBen Boeckel2020-10-287-3/+31
| | | | | | | | | | | | | | | | | | | | | The old `check_X_source_runs` modules did not verify the arguments, so we cannot start doing it now. Downgrade the hard error introduced in commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a source runs, 2020-09-14) via !5223 into a noisy warning.
* | | Merge topic 'string-json-doc-update' into release-3.19Craig Scott2020-10-301-10/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 49fce3373b Help: Clarify string(JSON) error handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5427
| * | Help: Clarify string(JSON) error handlingPeter Steneteg2020-10-281-10/+13
| | | | | | | | | | | | Closes: #21355
* | | CMake 3.19.0-rc2v3.19.0-rc2Brad King2020-10-281-1/+1
| | |
* | | Merge topic 'cmake-presets-help-flag' into release-3.19Brad King2020-10-283-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c619be2784 ccmake: Don't list --preset in --help Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5428
| * | | ccmake: Don't list --preset in --helpKyle Edwards2020-10-273-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | And show available options in cmake-gui. Fixes: #21313
* | | | Merge topic 'cmake_path-update-doc' into release-3.19Brad King2020-10-281-122/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec5951e078 cmake_path: Enhance documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5425
| * | | | cmake_path: Enhance documentationMarc Chevrier2020-10-261-122/+127
| | | | |
* | | | | Merge topic 'cmake-gui-manual-argument' into release-3.19Brad King2020-10-283-14/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef03124237 CMake GUI: Add --browse-manual argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5417
| * | | | | CMake GUI: Add --browse-manual argumentKyle Edwards2020-10-273-14/+26
| | |/ / / | |/| | |
* | | | | Merge topic 'FindRuby-restore-VENDORLIB_DIR' into release-3.19Brad King2020-10-281-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR 4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5434
| * \ \ \ \ Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIRBrad King2020-10-273670-16914/+57155
| |\ \ \ \ \ | | |/ / / /
| * | | | | FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIRBrad King2020-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. This variable was accidentally left out. Fixes: #21369
* | | | | | Merge topic 'xcode-fix-source-linking' into release-3.19Brad King2020-10-281-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dc23300b1 Xcode: Fix regression that automatically links libraries in source list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5432
| * | | | | | Xcode: Fix regression that automatically links libraries in source listGusts Kaksis2020-10-271-2/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit e637744c51 (Xcode: Use "Link Binary With Libraries" to link any library, 2019-07-10, v3.19.0-rc1~494^2~1) we accidentally added all the library type files to "Link Binary With Libraries" build phase if they were passed in as source files. Revert that change as any actually linked libraries will be added to that build phase later in the `AddDependAndLinkInformation` call. Fixes: #21361
* | | | | | 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
| * | | | | 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 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
| * | | | | 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 'ninja-multi-per-config-sources' into release-3.18Brad King2020-10-263-1/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5430
| * \ \ \ \ \ Merge branch 'cmake-E-cat-binary' into release-3.18Brad King2020-10-1513-54/+109
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Merge-request: !5364
* | | | | | | 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
| * | | | | | 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 '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
| * | | | | | | CUDA: Use MSVC version to determine supported C++ standard levelsRobert Maynard2020-10-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21335
* | | | | | | | 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
| * | | | | | | | 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 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 branch 'release' into ninja-multi-per-config-sourcesKyle Edwards2020-10-263663-16910/+57048
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
| * | | | | | | 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 topic 'per-config-source-TARGET_FILE' into release-3.19Brad King2020-10-262-6/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd33bfcad5 add_custom_command: Properly recognize if sources depend on config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5410
| * | | | | | | add_custom_command: Properly recognize if sources depend on configDeniz Bahadir2020-10-222-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21349
* | | | | | | | Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-10-261-1/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5408
| * | | | | | | FindBoost: Honor BOOST_ROOT when finding upstream BoostConfigBrad King2020-10-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21200
| * | | | | | | FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfigBrad King2020-10-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #21200
generated by cgit v0.12 at 2025-03-13 08:36:28 (GMT)