mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,649 Commits 2 Branches 399 Tags
f2eec04728fef5ec2d2db9e56a4498e1902ed17a
Commit Graph

29814 Commits

Author SHA1 Message Date
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 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 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 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
Kitware Robot 35594cd434 CMake Nightly Date Stamp 2020-11-06 00:01:08 -05: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
Brad King c43b0505a5 Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-ASM' 
52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5464
 2020-11-05 07:58:37 -05:00
Brad King d720cd847e Merge topic 'cmprop-source' 
c7b50349de cmSourceFile::GetPropertyForUser: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5462
 2020-11-05 07:54:03 -05:00
Gusts Kaksis bffb17be3d Xcode: Inherit target library and framework search paths from project 
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
 2020-11-05 13:48:54 +02:00
Kitware Robot 1588e65f4c CMake Nightly Date Stamp 2020-11-05 00:01:07 -05:00
Maxime Girard 52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM 
Generate build command for assembly file in `compile_command.json`.

Issue: #20059
 2020-11-04 15:36:47 -05:00
Vitaly Stakhovsky c7b50349de cmSourceFile::GetPropertyForUser: return cmProp 
also fix GetSafeProperty() return type
 2020-11-04 10:11:54 -05:00
Kitware Robot 21ee7ea4e0 CMake Nightly Date Stamp 2020-11-04 00:01:07 -05:00
Marc Chevrier 1c912056a1 cmake_path: remove new command from 3.19 
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
 2020-11-03 09:55:35 -05:00
Brad King eea24ca551 Merge topic 'cmprop-grl' 
f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5456
 2020-11-03 07:31:03 -05:00
Brad King db02ccf406 Merge topic 'cmake-presets-no-path-arg-warning' 
cb2d01c182 CMakePresets.json: Don't warn if no path argument is given

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5455
 2020-11-03 07:24:25 -05:00
Kitware Robot 1a1008c3f3 CMake Nightly Date Stamp 2020-11-03 00:01:05 -05:00
vvs31415 f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp 2020-11-02 13:07:46 -05:00
Kyle Edwards cb2d01c182 CMakePresets.json: Don't warn if no path argument is given 
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
 2020-11-02 09:46:08 -05:00
Kitware Robot 4a266a2679 CMake Nightly Date Stamp 2020-11-02 00:01:18 -05:00
Kitware Robot af4243f054 CMake Nightly Date Stamp 2020-11-01 00:01:04 -04:00
Kitware Robot cc7052f594 CMake Nightly Date Stamp 2020-10-31 00:01:05 -04:00
Brad King 8d6b036449 Merge topic 'custom-command-cleanup' 
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
 2020-10-30 09:53:28 -04:00
Kitware Robot c3cac02d79 CMake Nightly Date Stamp 2020-10-30 00:01:07 -04:00
Brad King 32d369aa70 Merge topic 'llvm-rc-CMAKE_RC_FLAGS' 
ea03f50842 llvm_rc: add llvm_rc option filter to correctly pick up all options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5412
 2020-10-29 10:14:20 -04:00
Brad King 3e36d5e846 cmGeneratorTarget: Refactor custom command dependency evaluation 
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.
 2020-10-29 09:37:44 -04:00
Brad King c404f64289 cmCustomCommandGenerator: Collect genex target references in commands 
These will become target-level dependencies.
 2020-10-29 09:37:14 -04:00
Kitware Robot 1d3603a170 CMake Nightly Date Stamp 2020-10-29 00:01:05 -04:00
Brad King f506cc6bb2 CMake 3.19.0-rc2 2020-10-28 08:03:20 -04:00
Brad King 5ca2910f5f Merge topic 'cmake-presets-help-flag' 
c619be2784 ccmake: Don't list --preset in --help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5428
 2020-10-28 07:47:38 -04:00
Brad King 199247c21a Merge topic 'cmake-presets-help-flag' into release-3.19 
c619be2784 ccmake: Don't list --preset in --help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5428
 2020-10-28 07:47:37 -04:00
Brad King 9b4016a61a Merge topic 'xcode_build_jobs' 
e794509faa XCode: Use -j build option when job capacity is specified by user

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5429
 2020-10-28 07:38:07 -04:00
Brad King 4e59b42264 Merge topic 'cmake-gui-manual-argument' 
ef03124237 CMake GUI: Add --browse-manual argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5417
 2020-10-28 07:37:08 -04:00
Brad King fe310851a8 Merge topic 'cmake-gui-manual-argument' into release-3.19 
ef03124237 CMake GUI: Add --browse-manual argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5417
 2020-10-28 07:37:07 -04:00
Brad King 6c107cf303 Merge topic 'aix_makefile_build_jobs' 
f4c7d44d82 Makefiles: Use -j option as "-jN" and not "-j N"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5431
 2020-10-28 07:32:58 -04:00
Brad King e09400e360 Merge topic 'xcode-fix-source-linking' 
5dc23300b1 Xcode: Fix regression that automatically links libraries in source list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5432
 2020-10-28 07:26:47 -04:00
Brad King 15caa11da5 Merge topic 'xcode-fix-source-linking' into release-3.19 
5dc23300b1 Xcode: Fix regression that automatically links libraries in source list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5432
 2020-10-28 07:26:46 -04:00
Thomas Bernard ea03f50842 llvm_rc: add llvm_rc option filter to correctly pick up all options 
Fixes: #21315
 2020-10-28 07:19:31 -04:00
Kitware Robot 910fc4d880 CMake Nightly Date Stamp 2020-10-28 00:01:08 -04:00
Brad King 2a640d4199 cmCustomCommandGenerator: Add move operations 2020-10-27 14:58:15 -04:00
Brad King fab772c3e1 cmAddCustomCommandCommand: Drop outdated comment 2020-10-27 14:58:15 -04:00
Brad King 84fecbf214 cmLocalNinjaGenerator: Remove leftover local debugging comment 2020-10-27 14:58:15 -04:00
Brad King 9e5e2d704a Remove unnecessary arbitrary CollapseFullPath second arguments 
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.
 2020-10-27 14:36:16 -04:00
Kyle Edwards ef03124237 CMake GUI: Add --browse-manual argument 2020-10-27 12:05:41 -04:00