summaryrefslogtreecommitdiffstats
path: root/Source
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-gui-manual-argument' into release-3.19Brad 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 '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 '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
| * | 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' 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
| * | | 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 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
| | * | | 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-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
| * | | | 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-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
| * | | | | 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
| | * | | | CMakePresets.json: Properly report macro expansion errorsKyle Edwards2020-10-214-137/+190
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CMakePresets.json: Allow boolean for cache variable valueKyle Edwards2020-10-211-1/+23
| |/ / / | | | | | | | | | | | | Fixes: #21327
| * | | find_package: Fix regression in searching root prefixBrad King2020-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the check added by commit 2ff1693066 (find_package: avoid showing files as directories when searching config files, 2020-09-30, v3.19.0-rc1~67^2) to avoid skipping the root prefix `/`. Fixes: #21324
| * | | Merge topic 'separate_arguments-no-args' into release-3.19Brad King2020-10-191-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5382
| | * | | separate_arguments: Fix crash on *_COMMAND with no argumentsRobert Bozzetto2020-10-161-0/+5
| | | | | | | | | | | | | | | | | | | | Fixes: #21320
| * | | | Merge topic 'doc-CMP0111' into release-3.19Brad King2020-10-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Reinking <alex_reinking@berkeley.edu> Merge-request: !5385
| | * | | | CMP0111: Clarify that the new error is on a missing property settingBrad King2020-10-161-1/+1
| | |/ / / | | | | | | | | | | | | | | | The previous wording could be confused with the file missing on disk.
| * | | | Merge topic 'cmake-gui-disable-presets' into release-3.19Craig Scott2020-10-172-4/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d471406f0b CMake GUI: Disable preset fields instead of hiding them Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5374
| | * | | | CMake GUI: Disable preset fields instead of hiding themKyle Edwards2020-10-162-4/+15
| | | | | |
| * | | | | Merge topic 'file-configure-angle-brackets' into release-3.19Brad King2020-10-161-9/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5379
| | * | | | | file(CONFIGURE): Allow angle brackets in contentCristian Adam2020-10-151-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21306
| * | | | | | Fix regression in test/install/package configuration selectionBrad King2020-10-151-3/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7a969fe21d (cmMakefile: Refactor API to better handle empty config values, 2020-06-30, v3.19.0-rc1~567^2), calls to `GetGeneratorConfigs` that pass `OnlyMultiConfig` only want to get any configurations listed if the generator is multi-config. Fix the implementation to actually do that. Fixes: #21316
| * | | | | Merge topic 'cmake-E-cat-binary' into release-3.19Brad King2020-10-158-54/+103
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows 90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5364
| | * | | cmake: Fix '-E cat' command for binary files on WindowsJohnny Jazeix2020-10-143-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset `std::cout` to write in binary mode with no encoding conversions. Co-Author: Brad King <brad.king@kitware.com> Fixes: #21295
| | * | | cmConsoleBuf: Factor out cout/cerr console buffer managementBrad King2020-10-147-36/+65
| | | | |
| | * | | clang-format: Fix include block order in ctest.cxx and cpack.cxxBrad King2020-10-142-13/+14
| | | | |
| * | | | cmake-gui: Attach icons only to main GUI executablesBrad King2020-10-141-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit efe48189bf (cmake-gui: Restore application icon on macOS, 2020-10-13, v3.19.0-rc1~2^2) and commit f7ae4f572b (cmake-gui: Restore application icon on Windows, 2020-10-13, v3.19.0-rc1~1^2) we attached the icon source files to all consumers of `CMakeGUILib`, but that includes other libraries like `CMakeGUIMainLib`. The latter library is meant only for direct consumption by a GUI executable, so use that to propagate the icons instead.
| * | | CMake 3.19.0-rc1v3.19.0-rc1Brad King2020-10-131-1/+1
| | | |
| * | | cmake-gui: Restore application icon on WindowsBrad King2020-10-131-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim, 2020-09-14) the Windows resource source file that references the icon was moved to CMakeGUILib, but it needs to be directly in the main application in order to be attached properly.
| * | | cmake-gui: Restore application icon on macOSBrad King2020-10-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim, 2020-09-14) the macOS icon source file was moved to CMakeGUILib, but it needs to be directly in the main application in order to be attached to the `.app` in the right place.
| * | | export: Remove leftover inaccurate code commentCraig Scott2020-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | No functional changes. Relates: !5352
| * | | Merge topic 'export-namelink-only' into release-3.19Craig Scott2020-10-121-19/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64690f6df0 export: Do not fail generation for namelink-only case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5352
| | * | | export: Do not fail generation for namelink-only caseDeniz Bahadir2020-10-091-19/+27
| | | | |
| * | | | Ninja Multi-Config: Fix segfault when installing an exportKyle Edwards2020-10-091-7/+7
| |/ / / | | | | | | | | | | | | Fixes: #21290
| * | | Begin 3.19 release versioningBrad King2020-10-081-3/+3
| | |/ | |/|
| * | Merge topic 'ignore_MSB_warnings'Brad King2020-10-081-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5348
| | * | cm_cxx_features: Filter out MSBXXXX warningsAnonymous Maarten2020-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When building CMake in `%TMP%` on Windows, MSBuild issues warnings. Filter those out to avoid breaking C++ feature checks. Fixes: #21270
| * | | CMake Nightly Date StampKitware Robot2020-10-081-1/+1
| | | |