summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-dyndep-refactor'Brad King2020-11-092-178/+156
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cmNinjaTargetGenerator: Clarify variable names for preprocessing conditionsBrad King2020-11-061-17/+14
| | | | | | | | | | What is important about code paths for Fortran's explicit preprocessing is that the compilation step following it does not do preprocessing.
| * cmNinjaTargetGenerator: Simplify scan rule depfile selectionBrad King2020-11-061-30/+32
| | | | | | | | | | The depfile can always be the first output of the build statement with a `.d` suffix added. This approach easily avoids conflicts.
| * cmNinjaTargetGenerator: Generalize GetScanRule helperBrad King2020-11-061-30/+27
| | | | | | | | | | Allow the caller to provide any number of commands, and to choose which ones get a launcher.
| * cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocksBrad King2020-11-061-26/+19
| | | | | | | | | | The GetScanCommand and GetScanBuildStatement helpers are called only in code paths for dyndep. Drop their checks for this condition.
| * cmNinjaTargetGenerator: Revise conditions to clarify dyndep code pathsBrad King2020-11-061-10/+8
| | | | | | | | | | | | 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.
| * cmNinjaTargetGenerator: Clarify scan rule code groupingBrad King2020-11-061-24/+28
| |
| * cmNinjaTargetGenerator: Clarify scan rule helper functionsBrad King2020-11-061-73/+68
| | | | | | | | | | Revise names to clarify that these helpers are for the dependency scanning commands, which may happen to preprocess.
| * cmNinjaTargetGenerator: Drop unnecessary mutationBrad King2020-11-061-2/+2
| | | | | | | | GetPreprocessScanRule's caller always has `vars.Source` set to `$in`.
| * cmNinjaTargetGenerator: Clarify method namesBrad King2020-11-062-16/+15
| |
| * cmNinjaTargetGenerator: Consolidate redundant methodsBrad King2020-11-062-11/+4
| |
* | CMake Nightly Date StampKitware Robot2020-11-091-1/+1
| |
* | CMake Nightly Date StampKitware Robot2020-11-081-1/+1
| |
* | CMake Nightly Date StampKitware Robot2020-11-071-1/+1
|/
* Merge topic 'clang-tidy-for-objc'Brad King2020-11-063-14/+28
|\ | | | | | | | | | | | | 1134064e22 clang-tidy: allow OBJC and OBJCXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5467
| * clang-tidy: allow OBJC and OBJCXXAndrew Fuller2020-11-053-14/+28
| |
* | Merge topic 'cmprop-improve'Brad King2020-11-0612-49/+39
|\ \ | | | | | | | | | | | | | | | | | | f6e7d5f3a0 Reduce the scope of temporary cmProp variables and other improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5471
| * | Reduce the scope of temporary cmProp variables and other improvementsVitaly Stakhovsky2020-11-0512-49/+39
| | |
* | | Merge topic 'cmake-gui-file-dialog-crash'Brad King2020-11-062-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5f782119c8 cmake-gui: Restore workaround for crash in file dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5472
| * | | cmake-gui: Restore workaround for crash in file dialogBrad King2020-11-052-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'xcode-inherit-paths'Brad King2020-11-061-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bffb17be3d Xcode: Inherit target library and framework search paths from project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5463
| * | | | Xcode: Inherit target library and framework search paths from projectGusts Kaksis2020-11-051-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode has multiple levels of build settings with priority in descending order: 1. Target 2. Project 3. Workspace 4. SDK defaults `CMAKE_XCODE_ATTRIBUTE_*` path variables add these to project level, but linked frameworks and libraries override this in target level. Add the `$(inherited)` macro to keep both in the final list. Fixes: #21387
| * | | cmake_path: remove new command from 3.19Marc Chevrier2020-11-032-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Defer adding this command until post-3.19 development so that it has more time to mature before being included in a release. Issue: #21385
* | | | CMake Nightly Date StampKitware Robot2020-11-061-1/+1
| |/ / |/| |
* | | Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-ASM'Brad King2020-11-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5464
| * | | Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASMMaxime Girard2020-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Generate build command for assembly file in `compile_command.json`. Issue: #20059
* | | | Merge topic 'cmprop-source'Brad King2020-11-055-15/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7b50349de cmSourceFile::GetPropertyForUser: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5462
| * | | | cmSourceFile::GetPropertyForUser: return cmPropVitaly Stakhovsky2020-11-045-15/+17
| |/ / / | | | | | | | | | | | | also fix GetSafeProperty() return type
* | | | CMake Nightly Date StampKitware Robot2020-11-051-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2020-11-041-1/+1
|/ /
* | Merge topic 'cmprop-grl'Brad King2020-11-038-31/+29
|\ \ | | | | | | | | | | | | | | | | | | f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5456
| * | cmLocalGenerator::GetRuleLauncher: return cmPropvvs314152020-11-028-31/+29
| | |
* | | Merge topic 'cmake-presets-no-path-arg-warning'Brad King2020-11-031-1/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | cb2d01c182 CMakePresets.json: Don't warn if no path argument is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5455
| * | CMakePresets.json: Don't warn if no path argument is givenKyle Edwards2020-11-021-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | If --preset is specified with no path argument, use the current directory as the source directory, the preset's binaryDir as the binary directory, and don't issue the standard warning for no path specified. Fixes: #21386
| * | CMake 3.19.0-rc2v3.19.0-rc2Brad King2020-10-281-1/+1
| | |
| * | 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
| * \ \ 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
| * \ \ \ 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
* | | | | | CMake Nightly Date StampKitware Robot2020-11-031-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2020-11-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-11-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-10-311-1/+1
| | | | |
* | | | | Merge topic 'custom-command-cleanup'Brad King2020-10-308-97/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e36d5e846 cmGeneratorTarget: Refactor custom command dependency evaluation c404f64289 cmCustomCommandGenerator: Collect genex target references in commands 2a640d4199 cmCustomCommandGenerator: Add move operations fab772c3e1 cmAddCustomCommandCommand: Drop outdated comment 84fecbf214 cmLocalNinjaGenerator: Remove leftover local debugging comment 9e5e2d704a Remove unnecessary arbitrary CollapseFullPath second arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5435
| * | | | | cmGeneratorTarget: Refactor custom command dependency evaluationBrad King2020-10-293-64/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we only used cmCustomCommandGenerator to evaluate generator expressions for dependencies. Use it for command lines too. It also collects target references for us, with backtraces.
| * | | | | cmCustomCommandGenerator: Collect genex target references in commandsBrad King2020-10-292-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | These will become target-level dependencies.
| * | | | | cmCustomCommandGenerator: Add move operationsBrad King2020-10-272-9/+11
| | | | | |
| * | | | | cmAddCustomCommandCommand: Drop outdated commentBrad King2020-10-271-9/+1
| | | | | |
| * | | | | cmLocalNinjaGenerator: Remove leftover local debugging commentBrad King2020-10-271-5/+0
| | | | | |
| * | | | | Remove unnecessary arbitrary CollapseFullPath second argumentsBrad King2020-10-273-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some calls to CollapseFullPath that already have an absolute path were updated by commit 22f38c0d6b (cmake: avoid getcwd in `CollapseFullPath`, 2020-01-14, v3.17.0-rc1~171^2) to pass an arbitrary second argument to prevent unnecessary `getcwd` calls. Since then, the KWSys implementation of CollapseFullPath has learned to avoid unnecessary `getcwd` calls on its own, so we can drop the arbitrary second arguments to our CollapseFullPath calls.
* | | | | | CMake Nightly Date StampKitware Robot2020-10-301-1/+1
| | | | | |