summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | Merge topic 'docs-cleanup-3.19' into release-3.19Craig Scott2020-10-2614-90/+107
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95c14579f2 Help: Cleanup typos and grammar for the 3.19 release Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5419
| * | | | | | | Help: Cleanup typos and grammar for the 3.19 releaseCraig Scott2020-10-2414-90/+107
|/ / / / / / /
* | | | | | | Merge topic 'vs-fortran-debugging-flags' into release-3.19Brad King2020-10-231-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5406
| * | | | | | | VS: Remove flag table entries for Fortran /Z* flagsVolker Jacht2020-10-221-3/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were included when the Fortran flag table was first created by commit 10c91ded4f (ENH: add support for Intel Fortran Visual studio IDE, 2008-04-30, v2.8.0~2227), but they map to fields not actually supported by the IDE. Remove their table entries. Instead use just `/debug:minimal` and `/debug:full` to control debug information level in VS Intel Fortran. Let flags like `/Z7` pass through as raw additional options because they have no corresponding IDE property and can be used to complement the supported options. Fixes: #21340
* | | | | | | Merge topic 'cmake-presets-toolset-arch-config' into release-3.19Craig Scott2020-10-2333-95/+241
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5387
| * | | | | | | CMakePresets.json: Split cmakeGeneratorConfig fieldKyle Edwards2020-10-2233-95/+241
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make this field separate for both architecture and toolset. Allow architecture and toolset to be either strings or objects with value and strategy fields. Fixes: #21317
* | | | | | | Merge topic 'cmake-presets-source-dir-name' into release-3.19Craig Scott2020-10-235-0/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25742c589c CMakePresets.json: Add ${sourceDirName} macro Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5386
| * | | | | | CMakePresets.json: Add ${sourceDirName} macroKyle Edwards2020-10-225-0/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes: #21312
* | | | | | Merge topic 'cmake-presets-invalid-macro' into release-3.19Kyle Edwards2020-10-2217-183/+268
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
| * | | | | | CMakePresets.json: Properly report macro expansion errorsKyle Edwards2020-10-2117-183/+268
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a distinction between strings which simply use the $vendor{<...>} macro, which is valid but makes it unusable by CMake, and strings which actually contain invalid macro expansions. Fixes: #21308
* | | | | | Merge topic 'cmake-presets-boolean-cache' into release-3.19Kyle Edwards2020-10-226-7/+71
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 920d180047 CMakePresets.json: Allow boolean for cache variable value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5398
| * | | | | CMakePresets.json: Allow boolean for cache variable valueKyle Edwards2020-10-216-7/+71
|/ / / / / | | | | | | | | | | | | | | | Fixes: #21327
* | | | | Merge topic 'cmakepresets-schema' into release-3.19Kyle Edwards2020-10-2110-2/+315
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21bc2fd945 CI: Install jsonschema for schema testing e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 0307f7c980 Help: Add JSON schema for CMakePresets.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5366
| * | | | | CI: Install jsonschema for schema testingKyle Edwards2020-10-203-1/+3
| | | | | |
| * | | | | Tests: Add JSON schema validation to CMakePresets.json testsKyle Edwards2020-10-204-1/+61
| | | | | |
| * | | | | Help: Add JSON schema for CMakePresets.jsonBen McMorran2020-10-203-0/+251
| | | | | |
* | | | | | Merge topic 'ci-win-python' into release-3.19Brad King2020-10-202-0/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f7fef629b ci: add Python to PATH on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5403
generated by cgit v0.12 at 2025-02-08 16:40:06 (GMT)