Commit Graph

50665 Commits

Author SHA1 Message Date
Brad King
2b0a1180b0 Merge topic 'ninja-dyndep-refactor'
941be1d356 cmNinjaTargetGenerator: Clarify variable names for preprocessing conditions
33a8e0bb09 cmNinjaTargetGenerator: Simplify scan rule depfile selection
bff1871c39 cmNinjaTargetGenerator: Generalize GetScanRule helper
9f60e8aa52 cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocks
43fe7e0c97 cmNinjaTargetGenerator: Revise conditions to clarify dyndep code paths
1416012f2c cmNinjaTargetGenerator: Clarify scan rule code grouping
f2eec04728 cmNinjaTargetGenerator: Clarify scan rule helper functions
170cfc764d cmNinjaTargetGenerator: Drop unnecessary mutation
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5478
2020-11-09 08:02:33 -05:00
Brad King
b1bc99d34a Merge topic 'TestBigEndian-use-abi-result'
fcc89bda1d TestBigEndian: Re-implement using byte order detected from ABI check
412ce907a2 Tests: Prepare RunCMake.ABI cases to run more checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5477
2020-11-09 08:01:37 -05:00
Brad King
d0391599a8 Merge topic 'android-flags'
94d87afece Android: allow NDK to control cflags / ldflags
85e5139aba Android: Move *_LLVM_TRIPLE to the centralized table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5461
2020-11-09 07:58:49 -05:00
Kitware Robot
eb48859594 CMake Nightly Date Stamp 2020-11-09 00:01:10 -05:00
Kitware Robot
94be747920 CMake Nightly Date Stamp 2020-11-08 00:01:06 -05:00
Kitware Robot
ae488d025f CMake Nightly Date Stamp 2020-11-07 00:01:08 -05:00
Brad King
941be1d356 cmNinjaTargetGenerator: Clarify variable names for preprocessing conditions
What is important about code paths for Fortran's explicit preprocessing
is that the compilation step following it does not do preprocessing.
2020-11-06 11:51:02 -05:00
Brad King
33a8e0bb09 cmNinjaTargetGenerator: Simplify scan rule depfile selection
The depfile can always be the first output of the build statement
with a `.d` suffix added.  This approach easily avoids conflicts.
2020-11-06 11:50:38 -05:00
Brad King
bff1871c39 cmNinjaTargetGenerator: Generalize GetScanRule helper
Allow the caller to provide any number of commands, and to choose which
ones get a launcher.
2020-11-06 11:43:52 -05:00
Brad King
9f60e8aa52 cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocks
The GetScanCommand and GetScanBuildStatement helpers are called only in
code paths for dyndep.  Drop their checks for this condition.
2020-11-06 11:43:52 -05:00
Brad King
43fe7e0c97 cmNinjaTargetGenerator: Revise conditions to clarify dyndep code paths
All the scan-related code paths are actually about dyndep rather than
explicit preprocessing.  It just happens that the implementation for
Fortran requires explicit preprocessing.
2020-11-06 11:43:52 -05:00
Brad King
1416012f2c cmNinjaTargetGenerator: Clarify scan rule code grouping 2020-11-06 11:43:52 -05:00
Brad King
f2eec04728 cmNinjaTargetGenerator: Clarify scan rule helper functions
Revise names to clarify that these helpers are for the dependency
scanning commands, which may happen to preprocess.
2020-11-06 11:43:52 -05:00
Brad King
170cfc764d cmNinjaTargetGenerator: Drop unnecessary mutation
GetPreprocessScanRule's caller always has `vars.Source` set to `$in`.
2020-11-06 11:43:52 -05:00
Brad King
fcf3fc4447 cmNinjaTargetGenerator: Clarify method names 2020-11-06 11:43:52 -05:00
Brad King
fe5d0849db cmNinjaTargetGenerator: Consolidate redundant methods 2020-11-06 11:43:51 -05:00
Brad King
a117101fbd Merge branch 'release-3.19' into master 2020-11-06 10:22:07 -05:00
Brad King
7a04f45722 CMake 3.19.0-rc3 v3.19.0-rc3 2020-11-06 09:19:57 -05:00
Brad King
fcc89bda1d TestBigEndian: Re-implement using byte order detected from ABI check
Document the module as deprecated in favor of the ABI check results.
2020-11-06 09:17:30 -05:00
Brad King
412ce907a2 Tests: Prepare RunCMake.ABI cases to run more checks 2020-11-06 08:33:03 -05:00
Brad King
ffda92d4bf Merge topic 'clang-tidy-for-objc'
1134064e22 clang-tidy: allow OBJC and OBJCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5467
2020-11-06 08:05:00 -05:00
Brad King
cc2d849e69 Merge topic 'cmprop-improve'
f6e7d5f3a0 Reduce the scope of temporary cmProp variables and other improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5471
2020-11-06 08:04:26 -05:00
Brad King
7b6a9ac8e7 Merge topic 'android-build-type'
3dae826e43 Android: default to RelWithDebInfo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5465
2020-11-06 08:03:27 -05:00
Brad King
5696be33a6 Merge topic 'FindICU-naming'
21cb588629 FindICU: Correct variable names to match documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5451
2020-11-06 08:02:30 -05:00
Brad King
02d6c98210 Merge topic 'cpack-nuget'
41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5415
2020-11-06 08:01:41 -05:00
Brad King
3a69c7779a Merge branch 'release-3.19' 2020-11-06 07:58:55 -05:00
Brad King
e0438b05de Merge topic 'apple-v4-tbd-file-arch-lookup'
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
2020-11-06 07:58:55 -05:00
Brad King
b80e39d0f6 Merge topic 'apple-v4-tbd-file-arch-lookup' into release-3.19
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
2020-11-06 07:58:54 -05:00
Brad King
2e86b0ec51 Merge branch 'release-3.19' 2020-11-06 07:57:51 -05:00
Brad King
dd8c91a4f3 Merge topic 'cmake-gui-file-dialog-crash' into release-3.19
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
2020-11-06 07:57:51 -05:00
Brad King
a0453a7f0c Merge topic 'cmake-gui-file-dialog-crash'
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
2020-11-06 07:57:51 -05:00
Brad King
d1039f74a9 Merge branch 'release-3.19' 2020-11-06 07:55:48 -05:00
Brad King
b065b1ad09 Merge topic 'FindPostgreSQL-13'
f3f09f1c96 FindPostgreSQL: support version 13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5468
2020-11-06 07:55:48 -05:00
Brad King
0adaed609f Merge topic 'FindPostgreSQL-13' into release-3.19
f3f09f1c96 FindPostgreSQL: support version 13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5468
2020-11-06 07:55:47 -05:00
Brad King
2b2ca47eda Merge branch 'release-3.19' 2020-11-06 07:43:03 -05:00
Brad King
a775a6a18b Merge topic 'xcode-inherit-paths' into release-3.19
bffb17be3d Xcode: Inherit target library and framework search paths from project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
2020-11-06 07:43:03 -05:00
Brad King
b2552d50da Merge topic 'xcode-inherit-paths'
bffb17be3d Xcode: Inherit target library and framework search paths from project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
2020-11-06 07:43:03 -05:00
Craig Scott
dd547c6a74 Merge branch 'release-3.19' 2020-11-06 05:50:53 -05:00
Craig Scott
9201b3fa40 Merge topic 'help_ctest_cuda_memcheck'
e620bb7293 Help: Add cuda-memcheck to CTest documentation
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5469
2020-11-06 05:50:53 -05:00
Craig Scott
10b36244b6 Merge topic 'help_ctest_cuda_memcheck' into release-3.19
e620bb7293 Help: Add cuda-memcheck to CTest documentation
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5469
2020-11-06 05:50:52 -05:00
Kitware Robot
35594cd434 CMake Nightly Date Stamp 2020-11-06 00:01:08 -05:00
Haibo Huang
94d87afece Android: allow NDK to control cflags / ldflags 2020-11-05 19:45:28 -08:00
Haibo Huang
85e5139aba Android: Move *_LLVM_TRIPLE to the centralized table
This allows us to skip `abi-*.cmake` in the next change.
In the future we may move all this information to the NDK.
2020-11-05 19:45:09 -08:00
Brad King
5f782119c8 cmake-gui: Restore workaround for crash in file dialog
In commit ce9dbceb42 (QtDialog: remove Qt4-only code, 2020-06-02,
v3.19.0-rc1~712^2~1) we removed an event filter that was thought to be
necessary only as a workaround for a bug in Qt.  However, that bug was
fixed in Qt 4.5, and the file dialog still crashes as of Qt 5.14 without
the filter.  Restore the workaround pending further investigation.

Fixes: #21400
2020-11-05 14:50:45 -05:00
Andrew Fuller
1134064e22 clang-tidy: allow OBJC and OBJCXX 2020-11-05 11:39:32 -08:00
Vitaly Stakhovsky
f6e7d5f3a0 Reduce the scope of temporary cmProp variables and other improvements 2020-11-05 11:07:39 -05:00
Bob Apthorpe
41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language
Also update the XML Schema.

Fixes: #21348
2020-11-05 10:49:25 -05:00
Tor Arne Vestbø
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4
Extend the `.tbd` parsing from commit 170e598add (iOS: Fix detection of
supported SDK architectures, 2020-04-16, v3.17.2~11^2) to support `.tbd`
file version 4.
2020-11-05 10:21:23 -05:00
Tobias Ribizel
e620bb7293 Help: Add cuda-memcheck to CTest documentation
Issue: #21388
2020-11-05 10:05:01 -05:00
Tobias Ribizel
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module
Issue: #21388
2020-11-05 10:04:44 -05:00