summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xcode_build_jobs'Brad King2020-10-281-6/+5
|\ | | | | | | | | | | | | e794509faa XCode: Use -j build option when job capacity is specified by user Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5429
| * XCode: Use -j build option when job capacity is specified by userFred Baksik2020-10-261-6/+5
| | | | | | | | Fixes: #18304
* | Merge topic 'cmake-gui-manual-argument'Brad King2020-10-282-14/+22
|\ \ | | | | | | | | | | | | | | | | | | 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-272-14/+22
| | |
| * | Merge topic 'cuda_vs_skip_computation' into release-3.19Brad King2020-10-273-2/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'cmake-presets-path-arg' into release-3.19Craig Scott2020-10-277-5/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7d7eca66d CMakePresets.json: Rework how --preset argument is handled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5416
* | \ \ \ Merge topic 'aix_makefile_build_jobs'Brad King2020-10-281-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4c7d44d82 Makefiles: Use -j option as "-jN" and not "-j N" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5431
| * | | | | Makefiles: Use -j option as "-jN" and not "-j N"Fred Baksik2020-10-261-3/+4
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #21090
* | | | | Merge topic 'xcode-fix-source-linking'Brad 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
* | | | | CMake Nightly Date StampKitware Robot2020-10-281-1/+1
| | | | |
* | | | | Merge topic 'cuda_vs_skip_computation'Brad King2020-10-273-2/+14
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 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-273-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5430
* | \ \ \ \ Merge topic 'cmake-presets-path-arg'Craig Scott2020-10-277-5/+17
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-267-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-277-27/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-247-27/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User defined permissions and options to copy permissions are implemented. Fixes: #20866
* | | | | | | Merge topic 'issue-21034'Brad King2020-10-271-9/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a3d125de8 target_sources: Support custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5421
| * | | | | | | target_sources: Support custom targetsAsit Dhal2020-10-241-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21034
* | | | | | | | Merge topic 'ninja-multi-per-config-sources'Brad King2020-10-271-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-26685-7807/+15778
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | 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 'per-config-source-TARGET_FILE' into release-3.19Brad King2020-10-261-6/+11
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd33bfcad5 add_custom_command: Properly recognize if sources depend on config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5410
| | * | | | | | | 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
| | * \ \ \ \ \ \ \ Merge topic 'cmake-presets-toolset-arch-config' into release-3.19Craig Scott2020-10-237-32/+83
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5387
| * | | | | | | | | | Ninja Multi-Config: Don't try to calculate dependencies for "all"Kyle Edwards2020-10-261-1/+3
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-10-271-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | 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 topic 'per-config-source-TARGET_FILE'Brad King2020-10-261-6/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21349
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-10-261-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-10-251-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-10-241-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge topic 'no-override-flow-control'Brad King2020-10-236-21/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aee7fdb32 cmState: Prohibit override of flow control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5409
| * | | | | | | | cmState: Prohibit override of flow control commandsKyle Edwards2020-10-226-21/+60
| | | | | | | | |
* | | | | | | | | Merge topic 'proper-command-nesting'Brad King2020-10-232-0/+126
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements 67383725bd cm::optional: Add constructor delegation to nullopt_t constructor 0668120398 cm::optional: Fix move assignment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5401
| * | | | | | | | | cmListFileCache: Enforce proper nesting of flow control statementsKyle Edwards2020-10-222-0/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19153
* | | | | | | | | | Merge topic 'vs-fortran-debugging-flags'Brad 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'Craig Scott2020-10-237-32/+83
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5387
| * | | | | | | | | CMakePresets.json: Split cmakeGeneratorConfig fieldKyle Edwards2020-10-227-32/+83
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'Craig Scott2020-10-231-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21312
| * | | | | | | Merge topic 'cmake-presets-invalid-macro' into release-3.19Kyle Edwards2020-10-224-137/+190
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-10-231-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'cmake-16773'Kyle Edwards2020-10-223-7/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5405
| * | | | | | | | include: refactor call sites of cmMakefile::ReadDependentFileAsit Dhal2020-10-213-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16773
* | | | | | | | | Merge topic 'cmake-presets-invalid-macro'Kyle Edwards2020-10-224-137/+190
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397