summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ctest-curl-debugfunction'Brad King2020-03-122-2/+2
|\ | | | | | | | | | | | | 7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4459
| * CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docsBetsy McPhail2020-03-112-2/+2
| | | | | | | | | | | | The curl debug callback function must return ``0``. Fixes: #20449
* | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \
| * \ Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' into release-3.17Brad King2020-03-121-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !4462
* | \ \ Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH'Brad King2020-03-121-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !4462
| * | | FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake pathBo Anderson2020-03-111-1/+2
| | |/ | |/|
* | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'swift-rpath' into release-3.17Brad King2020-03-121-4/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | f481b3a947 Swift: repair RPATH handling for macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4456
* | \ \ Merge topic 'swift-rpath'Brad King2020-03-121-4/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | f481b3a947 Swift: repair RPATH handling for macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4456
| * | | Swift: repair RPATH handling for macOSSaleem Abdulrasool2020-03-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration previously handled Linux properly but did not function on macOS as `ld64` does not support `:` delimited paths. Account for that by setting it to the empty string which will use multiple invocations of the `-Xlinker -rpath -Xlinker ...` pattern to compute the correct RPATH.
* | | | Merge branch 'release-3.17'Craig Scott2020-03-120-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'rename-macho-version-properties' into release-3.17Craig Scott2020-03-1211-44/+44
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
* | | | Merge topic 'rename-macho-version-properties'Craig Scott2020-03-1211-44/+44
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
| * | | macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSIONBrad King2020-03-1211-44/+44
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties added by commit 4a62e3d97c (macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties, 2020-01-24, v3.17.0-rc1~80^2~1) are general-purpose for all platforms using Mach-O formats and not just on OS X. Rename them accordingly. The properties are new to the CMake 3.17 release so we can rename them without compatibility concerns. Fixes: #20442
* | | CMake Nightly Date StampKitware Robot2020-03-121-1/+1
| | |
* | | Merge topic 'loops-improve'Brad King2020-03-115-24/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbbca9ee2a Convert more loops to range-based for-loops 9296cd0551 GHS: Name range-based for-loop variable types explicitly db17de2438 GHS: Use cm::erase in place of loop Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4446
| * | | Convert more loops to range-based for-loopsVitaly Stakhovsky2020-03-102-6/+5
| | | |
| * | | GHS: Name range-based for-loop variable types explicitlyVitaly Stakhovsky2020-03-101-7/+7
| | | | | | | | | | | | | | | | | | | | In general we avoid using `auto` except in cases of hard-to-name types like iterators.
| * | | GHS: Use cm::erase in place of loopVitaly Stakhovsky2020-03-102-11/+7
| | | |
* | | | Merge topic 'std-string-cleanup'Brad King2020-03-116-26/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6cd48ac41 Source: use std::string overloads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4453
| * | | | Source: use std::string overloadsVitaly Stakhovsky2020-03-106-26/+23
| | | | |
* | | | | Merge branch 'release-3.17'Brad King2020-03-110-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'FindCUDAToolkit-reduce-verbosity' into release-3.17Brad King2020-03-111-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7cf574417 CUDAToolkit: Mark find queries as advanced variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4455
* | \ \ \ \ Merge topic 'FindCUDAToolkit-reduce-verbosity'Brad King2020-03-111-1/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a7cf574417 CUDAToolkit: Mark find queries as advanced variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4455
| * | | | | CUDAToolkit: Mark find queries as advanced variablesRobert Maynard2020-03-101-1/+8
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes #20435
* | | | | CMake Nightly Date StampKitware Robot2020-03-111-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'cuda_toolkit_dirs'Brad King2020-03-101-25/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0703e5fb6f CUDA: Perform CUDA toolkit include directory detection only on nvcc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4443
| * | | | CUDA: Perform CUDA toolkit include directory detection only on nvccRaul Tambre2020-03-081-25/+28
| | | | | | | | | | | | | | | | | | | | The code is specific to nvcc.
* | | | | Merge branch 'release-3.17'Brad King2020-03-100-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'release-notes-minor-cleanups' into release-3.17Brad King2020-03-101-13/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4449
* | \ \ \ \ Merge topic 'release-notes-minor-cleanups'Brad King2020-03-101-13/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4449
| * | | | | Help: Cleanup minor typos and grammar in 3.17 release notesCraig Scott2020-03-101-13/+13
| | | | | |
* | | | | | Merge branch 'release-3.17'Brad King2020-03-100-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'doc-3.17-relnotes' into release-3.17Brad King2020-03-103-6/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b925d0536 Help: Fix 3.17 release notes for Xcode scheme settings e0409b8bca Help: Fix toctree order of Xcode scheme variable and property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4447
* | \ \ \ \ \ Merge topic 'doc-3.17-relnotes'Brad King2020-03-103-6/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b925d0536 Help: Fix 3.17 release notes for Xcode scheme settings e0409b8bca Help: Fix toctree order of Xcode scheme variable and property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4447
| * | | | | | Help: Fix 3.17 release notes for Xcode scheme settingsBrad King2020-03-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 730a53ef1d (Help: Organize and revise 3.17 release notes, 2020-02-04, v3.17.0-rc1~21^2) we accidentally combined the release notes for `CMAKE_XCODE_SCHEME_ENVIRONMENT` and `XCODE_SCHEME_WORKING_DIRECTORY`. Split them up again. Also mention `CMAKE_XCODE_SCHEME_WORKING_DIRECTORY`. Fixes: #20439
| * | | | | | Help: Fix toctree order of Xcode scheme variable and propertyBrad King2020-03-102-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 92c4c852db (Xcode: Add custom working directory property, 2019-11-18, v3.17.0-rc1~400^2) the toctree links to the new properties were not added in sorted order. Move them. Issue: #20439
* | | | | | Merge branch 'release-3.17'Kyle Edwards2020-03-100-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'swift-ninja-multiconfig' into release-3.17Kyle Edwards2020-03-106-5/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65b3848de0 Swift: support Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4440
* | \ \ \ \ \ Merge topic 'swift-ninja-multiconfig'Kyle Edwards2020-03-106-6/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87819db28d Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig 65b3848de0 Swift: support Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4440
| * \ \ \ \ \ \ Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfigKyle Edwards2020-03-096-6/+16
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Swift: support Ninja Multi-ConfigSaleem Abdulrasool2020-03-096-5/+15
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Enable support for multi-configuration builds using Ninja when building Swift.
* | | | | | | Merge topic 'file-CONFIGURE'Brad King2020-03-1025-0/+253
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6fee09484 file: Add CONFIGURE subcommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4436
| * | | | | | | file: Add CONFIGURE subcommandLeander Beernaert2020-03-0925-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the `file()` command with a new `CONFIGURE` subcommand that behaves the same as `string(CONFIGURE)` except that it writes the resulting output immediately to a file. Fixes: #20388
* | | | | | | | Merge topic 'modernize-memory-management'Brad King2020-03-1012-137/+99
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44867a8c01 Modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4444
| * | | | | | | | Modernize memory managementMarc Chevrier2020-03-0812-137/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update internals of various classes.
* | | | | | | | | Merge topic 'std-string-genex'Brad King2020-03-106-30/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0dc52704b cmGeneratorExpression: remove const char* overloads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4445
| * | | | | | | | | cmGeneratorExpression: remove const char* overloadsVitaly Stakhovsky2020-03-086-30/+7
| |/ / / / / / / /
* | | | | | | | | Merge topic 'TI-C'Brad King2020-03-101-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a0fc68312 TI: Fix C toolchain command-lines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4422
| * | | | | | | | | TI: Fix C toolchain command-linesOliver Blasius2020-03-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `armar` arguments. Fix the linker `--map_file=` argument. Enable response files.