mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 02:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,589 Commits 2 Branches 401 Tags
52152409c364f333ec67ec899a22eebab4d3f0ab
Commit Graph

29795 Commits

Author SHA1 Message Date
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
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
Kyle Edwards c619be2784 ccmake: Don't list --preset in --help 
And show available options in cmake-gui.

Fixes: #21313
 2020-10-27 10:29:24 -04:00
Brad King c300355aab Merge topic 'cuda_vs_skip_computation' 
dd77dec18d VS: Don't compute CUDA options unless necessary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5422
 2020-10-27 08:20:55 -04:00
Brad King 8d6a0b9364 Merge topic 'cuda_vs_skip_computation' into release-3.19 
dd77dec18d VS: Don't compute CUDA options unless necessary
e9109dec36 Merge branch 'ninja-multi-per-config-sources' into release-3.18
7c0de4175b Merge branch 'cmake-E-cat-binary' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5422
 2020-10-27 08:20:54 -04:00
Craig Scott 105ef112c9 Merge topic 'cmake-presets-path-arg' 
b7d7eca66d CMakePresets.json: Rework how --preset argument is handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5416
 2020-10-27 07:33:46 -04:00
Craig Scott 698851cdb7 Merge topic 'cmake-presets-path-arg' into release-3.19 
b7d7eca66d CMakePresets.json: Rework how --preset argument is handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5416
 2020-10-27 07:33:45 -04:00
Raul Tambre dd77dec18d VS: Don't compute CUDA options unless necessary 
In the following scenario (with 3.18 policies):
1. A CXX target is created.
2. CUDA language is enabled.

CMake 3.18 introduced CMP0104, which requires CUDA_ARCHITECTURES to be
set.  Because the CXX target was created before CUDA was enabled it
wouldn't have it set.  The Visual Studio generator would however end up
computing CUDA compile options for the CXX target, which would result in
a fatal error due to the policy violation.

There doesn't seem to be a reason to do this for targets that don't
actually use the CUDA language, so we can skip and generate the CXX
target just fine.

Fixes: #21341
 2020-10-27 07:29:01 -04:00
Gusts Kaksis 5dc23300b1 Xcode: Fix regression that automatically links libraries in source list 
In commit e637744c51 (Xcode: Use "Link Binary With Libraries" to link
any library, 2019-07-10, v3.19.0-rc1~494^2~1) we accidentally added all
the library type files to "Link Binary With Libraries" build phase if
they were passed in as source files.  Revert that change as any actually
linked libraries will be added to that build phase later in the
`AddDependAndLinkInformation` call.

Fixes: #21361
 2020-10-27 07:12:26 -04:00
Brad King c79e02c4c3 Merge topic 'cmake-20866' 
03ad0e61c1 configure_file: Add option for user defined permissions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5320
 2020-10-27 07:11:13 -04:00
Brad King ecab18bb7c Merge topic 'issue-21034' 
1a3d125de8 target_sources: Support custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5421
 2020-10-27 07:10:24 -04:00
Brad King 2a1da463e9 Merge topic 'ninja-multi-per-config-sources' 
b8937a992b Merge branch 'release' into ninja-multi-per-config-sources
d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5430
 2020-10-27 06:59:57 -04:00
Kitware Robot 9cadb345d9 CMake Nightly Date Stamp 2020-10-27 00:01:05 -04:00
Fred Baksik f4c7d44d82 Makefiles: Use -j option as "-jN" and not "-j N" 
Fixes: #21090
 2020-10-26 18:32:59 -04:00
Brad King e9109dec36 Merge branch 'ninja-multi-per-config-sources' into release-3.18 
Merge-request: !5430
 2020-10-26 16:14:00 -04:00
Kyle Edwards b8937a992b Merge branch 'release' into ninja-multi-per-config-sources 2020-10-26 15:43:57 -04:00
Kyle Edwards d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all" 2020-10-26 15:37:04 -04:00
Fred Baksik e794509faa XCode: Use -j build option when job capacity is specified by user 
Fixes: #18304
 2020-10-26 13:28:54 -04:00
Brad King 388dc4d2ac Merge topic 'correct_profiling-output_exception' 
afac7482d2 cmake: command arguments which use '=' behave consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5414
 2020-10-26 10:29:23 -04:00
Brad King 9fa7afe7d3 Merge topic 'correct_profiling-output_exception' into release-3.19 
afac7482d2 cmake: command arguments which use '=' behave consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5414
 2020-10-26 10:29:22 -04:00
Brad King a1fe3be2bf Merge topic 'per-config-source-TARGET_FILE' into release-3.19 
cd33bfcad5 add_custom_command: Properly recognize if sources depend on config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5410
 2020-10-26 10:28:30 -04:00