summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Compare VS instance versions as stringsBrad King2021-06-176-25/+21
| | | | This makes the values more readable.
* Merge topic 'c_17_23-AppleClang'Brad King2021-06-171-1/+11
|\ | | | | | | | | | | | | | | b642022046 AppleClang: Add flags for C17 and C23 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6231
| * AppleClang: Add flags for C17 and C23Brad King2021-06-161-1/+11
| | | | | | | | Follow up commit 72f4984cdc (Clang: C23 support, 2021-02-07).
* | Merge branch 'release-3.20'Brad King2021-06-170-0/+0
|\ \
| * \ Merge topic 'fix-flow-control-override' into release-3.20Brad King2021-06-176-8/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
* | \ \ Merge topic 'fix-flow-control-override'Brad King2021-06-176-8/+22
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
| * | | CMake: Allow override of unexpected non-flow-control commandsKyle Edwards2021-06-166-8/+22
| | | | | | | | | | | | | | | | Fixes: #22310
* | | | Merge branch 'release-3.20'Brad King2021-06-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'vs-map-external-warnings' into release-3.20Brad King2021-06-174-14/+38
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6233
* | | | Merge topic 'vs-map-external-warnings'Brad King2021-06-174-10/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab3830401f Merge branch 'backport-3.20-vs-map-external-warnings' e4ca525d84 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 aabc3ca47d cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method e66a7fe07b cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace 947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6233
| * \ \ \ Merge branch 'backport-3.20-vs-map-external-warnings'Brad King2021-06-160-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | VS: Do not apply '/external:W*' flag table mapping on VS < 16.10Brad King2021-06-161-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*' flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the `ExternalWarningLevel` element. VS 16.9 does not support that element, but its `cl` compiler does support the `/external:W*` flags. Filter out the flag table entry on older VS versions. Fixes: #22308
| | * | | cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion methodBrad King2021-06-163-7/+19
| | | | | | | | | | | | | | | | | | | | Port from `cmGlobalVisualStudioVersionedGenerator`.
| | * | | cmGlobalVisualStudio10Generator: Move static functions to anonymous namespaceBrad King2021-06-161-4/+6
| | |/ /
| * | | VS: Do not apply '/external:W*' flag table mapping on VS < 16.10Brad King2021-06-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*' flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the `ExternalWarningLevel` element. VS 16.9 does not support that element, but its `cl` compiler does support the `/external:W*` flags. Filter out the flag table entry on older VS versions. Fixes: #22308
| * | | cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion methodBrad King2021-06-163-7/+17
| | | | | | | | | | | | | | | | Port from `cmGlobalVisualStudioVersionedGenerator`.
| * | | cmGlobalVisualStudio10Generator: Move static functions to anonymous namespaceBrad King2021-06-161-2/+4
| | |/ | |/|
* | | Merge topic 'ci-clang'Brad King2021-06-174-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 886a97cbe7 gitlab-ci: add job to test with clang-7 and ninja on debian10 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6237
| * | | gitlab-ci: add job to test with clang-7 and ninja on debian10Brad King2021-06-164-0/+19
| |/ / | | | | | | | | | | | | | | | In commit 7e5e558d0f (gitlab-ci: add job to test with clang-7 on debian10, 2021-06-04) we added coverage of clang-7 with the Unix Makefiles generator. Do the same for Ninja.
* | | Merge topic 'ci-cuda'Brad King2021-06-178-1/+83
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7af01efb6 gitlab-ci: add job testing cuda10.2 with clang 11 9548b059c0 ci: add clang-11 to cuda10.2 base image Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6236
| * | | gitlab-ci: add job testing cuda10.2 with clang 11Brad King2021-06-164-0/+23
| | | |
| * | | ci: add clang-11 to cuda10.2 base imageBrad King2021-06-165-1/+60
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-06-171-1/+1
| |/ / |/| |
* | | Merge topic 'FindLATEX'Brad King2021-06-161-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d3274e0a6f FindLATEX: Search user-local MiKTeX locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6230
| * | | FindLATEX: Search user-local MiKTeX locationsSteven A White2021-06-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | I've noticed the default installer for MikTex does not prompt for escalation. So, many installations I find do not have registry entries. This should cover finding it in the current defaults.
* | | | Merge topic 'scandep-format'Brad King2021-06-162-17/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a35d121276 Ninja: Populate P1689R4 compiled-module-path field for Fortran 10b2e53469 cmScanDepFormat: Remove Fortran-specific compiled-module-path logic 2b9890e9b9 cmScanDepFormat: Avoid writing lookup-method with default value Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6228
| * | | | Ninja: Populate P1689R4 compiled-module-path field for FortranBrad King2021-06-151-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scanning Fortran dependencies, we know the file path at which a provided module file is written. Store it in the `compiled-module-path` field as specified by P1689R4. Our collator in `cmake_ninja_dyndep` no longer needs to assume that the module file path can be derived from the logical module name. In the future, the Fortran dependency scanning may be done by the compiler itself, in which case it will provide the value of `compiled-module-path`.
| * | | | cmScanDepFormat: Remove Fortran-specific compiled-module-path logicBrad King2021-06-152-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read and write the `compiled-module-path` field only when explicitly known. Move the assumption that the `compiled-module-path` can be derived from the logical module name from the scandep parser to the `cmake_ninja_dyndep` helper.
| * | | | cmScanDepFormat: Avoid writing lookup-method with default valueBrad King2021-06-151-4/+4
| | |/ / | |/| |
* | | | Merge branch 'release-3.20'Brad King2021-06-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'ci-xcode-12.5' into release-3.20Brad King2021-06-161-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6229
* | \ \ \ Merge topic 'ci-xcode-12.5'Brad King2021-06-161-6/+6
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | 9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6229
| * | | gitlab-ci: update macOS jobs to use Xcode 12.5Brad King2021-06-151-6/+6
| |/ /
* | | CMake Nightly Date StampKitware Robot2021-06-161-1/+1
| |/ |/|
* | Merge topic 'ninja-scandep-preprocessor-output'Brad King2021-06-151-12/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 312ced6547 cmNinjaTargetGenerator: Fix scan rule PREPROCESSED_SOURCE placeholder 1dd9c4ab6f cmNinjaTargetGenerator: Clarify GetScanBuildStatement condition d94b23885a cmNinjaTargetGenerator: Simplify scan rule response file selection Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6227
| * | cmNinjaTargetGenerator: Fix scan rule PREPROCESSED_SOURCE placeholderBrad King2021-06-141-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | When running the module dependencies scan tool for for a language that does not compile the preprocessed output, we do not actually put the preprocessed output in the build graph. However, the value of `CMAKE_EXPERIMENTAL_<LANG>_SCANDEP_SOURCE` may reference the placeholder for the preprocessed source. Populate the placeholder to keep the file out of the way. In particular, do not clobber the `.ddi` file.
| * | cmNinjaTargetGenerator: Clarify GetScanBuildStatement conditionBrad King2021-06-141-1/+1
| | | | | | | | | | | | | | | Use the `compilePP` variable directly rather than relying on callers to make `compilePP == !ppFileName.empty()`.
| * | cmNinjaTargetGenerator: Simplify scan rule response file selectionBrad King2021-06-141-5/+1
| | | | | | | | | | | | | | | | | | Since commit 33a8e0bb09 (cmNinjaTargetGenerator: Simplify scan rule depfile selection, 2020-11-06, v3.20.0-rc1~516^2~1), the `$out` of the scan rule always matches our `.rsp` file selection, so use `$out.rsp`.
* | | Merge topic 'CMakeDependentOption'Brad King2021-06-155-1/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0665d9092e CMakeDependentOption: Allow parentheses in the depends string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6225
| * | | CMakeDependentOption: Allow parentheses in the depends stringDaniel Schürmann2021-06-145-1/+16
| |/ / | | | | | | | | | | | | | | | | | | `if()` takes the condition as a list of arguments. Parentheses need to be separated as well. Fixes: #22303
* | | CMake Nightly Date StampKitware Robot2021-06-151-1/+1
|/ /
* | Merge branch 'release-3.20'Brad King2021-06-140-0/+0
|\ \ | |/
| * CMake 3.20.4v3.20.4Brad King2021-06-141-1/+1
| |
* | Merge topic 'objc-std-17-23'Brad King2021-06-146-3/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | e8dc95ae1e ObjectiveC: Add C17 and C23 support Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6219
| * | ObjectiveC: Add C17 and C23 supportGregor Jasny2021-06-116-3/+40
| | | | | | | | | | | | Issue: #22297
* | | Merge topic 'FindBLAS-LAPACK-docs'Brad King2021-06-142-151/+186
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bf1651452 Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentation 8585a12bd9 Find{BLAS,LAPACK}: Move enabled language requirement to top of documentation 6a7c055f96 Find{BLAS,LAPACK}: Revise formatting of intro docs 43b581367d Find{BLAS,LAPACK}: Move implementation note from docs to comments 3beac78a13 Find{BLAS,LAPACK}: Revise imported targets documentation layout 6f305cd5fd Find{BLAS,LAPACK}: Factor out vendor documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6218
| * | | Find{BLAS,LAPACK}: Revise and extend Intel MKL usage documentationBrad King2021-06-112-25/+71
| | | | | | | | | | | | | | | | Fixes: #22295
| * | | Find{BLAS,LAPACK}: Move enabled language requirement to top of documentationBrad King2021-06-112-2/+4
| | | |
| * | | Find{BLAS,LAPACK}: Revise formatting of intro docsBrad King2021-06-112-2/+6
| | | |
| * | | Find{BLAS,LAPACK}: Move implementation note from docs to commentsBrad King2021-06-112-8/+6
| | | |
generated by cgit v0.12 at 2024-12-29 08:18:03 (GMT)