mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,608 Commits 2 Branches 393 Tags
4de28ba4e6348f99de57bd2961b00dcd4cda213b
Commit Graph

3267 Commits

Author SHA1 Message Date
Tin Huynh
4de28ba4e6 Tests: Update tests for NVHPC compiler 
Treat it just like PGI.
 2021-01-27 09:53:02 -05:00
Brad King
6153bd3a0c Merge topic 'update-bison-parser' 
7c6192472b LexerParser: Suppress -Wused-but-marked-unused warning in cmExprParser
6f64300a01 LexerParser: Clean up includes following include-what-you-use
699d50e376 LexerParser: Regenerate parser files with GNU Bison 3.7.4
c95442b9b1 LexerParser: Manual removing code from Bison is no longer needed
5a8a61a798 LexerParser: Do not use GNU Bison's yacc mode, we use Bison extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5730
 2021-01-27 09:05:43 -05:00
Brad King
f39fb0b90d Merge topic 'outdir-target-genex' 
64c3857780 OUTPUT_DIRECTORY: Support tgt genex in output artifact vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5690
 2021-01-27 09:04:29 -05:00
Asit Dhal
64c3857780 OUTPUT_DIRECTORY: Support tgt genex in output artifact vars 
Following variables now support target dependent generator expressions.
- CMAKE_RUNTIME_OUTPUT_DIRECTORY
- CMAKE_LIBRARY_OUTPUT_DIRECTORY
- CMAKE_ARCHIVE_OUTPUT_DIRECTORY

Fixes: #18055
 2021-01-26 12:13:15 -05:00
Rodolfo Lima
bdf30bdad8 CPack: add CPACK_THREADS variable to control compression threads 
This allows setting how many threads the compressor will use.
Currently only implemented for XZ when using system's lzma library.

Fixes: #21715
 2021-01-26 16:23:37 +01:00
Brad King
1380e611e1 Merge topic 'nmc-cache-targets' 
ccbedb80e4 Ninja Multi-Config: Restore rebuild_cache and edit_cache targets
6fdbe9201f cmNinjaUtilityTargetGenerator: Remove leftover development comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5740
 2021-01-26 09:09:18 -05:00
Brad King
ccbedb80e4 Ninja Multi-Config: Restore rebuild_cache and edit_cache targets 
Since commit dcf9f4d2f7 (Ninja Multi-Config: Add support for
cross-config custom commands, 2020-12-09) we were not generating these
targets.  Restore them and add a test.

Fixes: #21722
 2021-01-25 15:22:53 -05:00
Christoph Grüninger
699d50e376 LexerParser: Regenerate parser files with GNU Bison 3.7.4 
Adjust expected test output.
 2021-01-25 12:06:17 -05:00
Craig Scott
ee9da76972 Unity: Generate reproducible unity IDs for anonymous namespaces 
Fixes: #21564
 2021-01-23 07:14:05 +11:00
Brad King
6bf23b2755 Merge topic 'macos-include-weak-dependencies' 
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
 2021-01-21 09:16:37 -05:00
Brad King
063f7127d1 Merge topic 'ninja-custom_command-depfile' 
b5c2163293 Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5710
 2021-01-20 11:23:13 -05:00
Bianca van Schaik
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected 
Starting with Clang 12, `otool -l` reports `LC_LOAD_WEAK_DYLIB` instead
of `LC_LOAD_DYLIB` for weakly linked libraries.  Update the
implementation of `file(GET_RUNTIME_DEPENDENCIES)` to recognize these.

Fixes: #21684
 2021-01-20 10:26:54 -05:00
Marc Chevrier
b5c2163293 Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency 
Fixes: #21694
 2021-01-19 13:17:14 +01:00
Asit Dhal
8f33674491 cpack(DEB): Issue warning if custom script for control file is missing 
Fixes: #17794
 2021-01-15 16:41:37 +01:00
Marc Chevrier
50b8dc8735 Merge topic 'cmake_path-stabilization' 
76f0bcdfb6 cmake_path: various updates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5695
 2021-01-15 05:47:02 -05:00
Brad King
cc47f4ebf9 Merge topic 'fileapi-toolchains' 
6418dabb87 Tests: Add test for toolchains-v1 File API object
1c5bd1bed5 Tests: Add toolchains kind to capabilities test
f72bb2ee0d Help: Add documentation for "toolchains" object kind
bb069c0857 cmFileAPI: Add "toolchains" object kind.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5678
 2021-01-14 13:02:54 -05:00
Brad King
967d1f7dde Merge topic 'install-FILES-rename-genex' 
ac3ccc393e install(files): Support genex in rename option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5694
 2021-01-14 13:00:16 -05:00
Marc Chevrier
76f0bcdfb6 cmake_path: various updates 
To follow discussions in #21385 and !5682:
* Fix bug in cmCMakePath::IsSuffix() method
* cmake_path(HASH) always normalized paths (NORMALIZE option removed)
 2021-01-13 15:27:49 +01:00
Brad King
438ed46c13 Merge topic 'ExternalProject-configure-handled-by-build' 
7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5626
 2021-01-13 09:21:47 -05:00
Brad King
27c2579efd Merge topic 'issue-21663' 
38e2299fc8 list(REMOVE_ITEM): Make removal of an empty item a no-op.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5693
 2021-01-13 09:21:00 -05:00
Asit Dhal
ac3ccc393e install(files): Support genex in rename option 
Fixes: #19903
 2021-01-13 11:27:56 +01:00
Ben McMorran
6418dabb87 Tests: Add test for toolchains-v1 File API object 2021-01-12 15:43:38 -08:00
Ben McMorran
1c5bd1bed5 Tests: Add toolchains kind to capabilities test 2021-01-12 14:25:39 -08:00
Brad King
db8e2e711a Merge topic 'ninja-multi-config-post-build' 
98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5673
 2021-01-12 10:25:07 -05:00
Brad King
b7485c98a0 Merge topic 'trace_expand_bracket' 
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5687
 2021-01-12 10:20:26 -05:00
Daan De Meyer
7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option 
Fixes #21592.
 2021-01-12 08:50:02 +01:00
Asit Dhal
38e2299fc8 list(REMOVE_ITEM): Make removal of an empty item a no-op. 
Fixes: #21663
 2021-01-12 08:27:40 +01:00
Raul Tambre
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand 
Bracket arguments are literal and shouldn't be expanded.

Fixes #21671.
 2021-01-11 19:54:18 +02:00
Brad King
38335f275f Merge topic 'xcode-object-ids' 
b8b6573db8 Xcode: Use deterministic object ids for script build phases
2892228dc9 cmGlobalXCodeGenerator: Add infrastructure for deterministic object ids
d250b67722 cmGlobalXCodeGenerator: Adopt pbxproj object id generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5671
 2021-01-08 09:07:18 -05:00
Kyle Edwards
98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap 
Fixes: #21252
 2021-01-07 11:26:17 -05:00
Brad King
1cbbfbc78f Merge topic 'export-compile-commands-per-target' 
a742b5d137 CMAKE_EXPORT_COMPILE_COMMANDS: allow configuration per target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5651
 2021-01-07 08:22:27 -05:00
Brad King
b8b6573db8 Xcode: Use deterministic object ids for script build phases 
The Xcode "new build system" only considers a script build phase up to
date if it has run before, even if outputs are newer than inputs.  Use a
deterministic object id for script build phases associated with custom
commands so that they do not need to re-run after CMake re-generates the
project.

Fixes: #21669
 2021-01-06 18:46:30 -05:00
Shannon Booth
a742b5d137 CMAKE_EXPORT_COMPILE_COMMANDS: allow configuration per target 
The new target property `EXPORT_COMPILE_COMMANDS` associated with the
existing global variable can be used to optionally configure targets for
their compile commands to be exported.

Fixes: #19462
 2021-01-06 11:51:39 +13:00
Kai Wang
b696f78073 cmDepends: merge dependers of depend makefile 
Since one depender has multiple dependees, depend makefile generated
same depender line by line, to reduce file size and refine make file
parse speed, merge same dependers to one. And add a testcase for
large depend.make which generated source file includes 20000 header
files and run build and incremental build

Signed-off-by: Wangkai <wangkai86@huawei.com>
Signed-off-by: Zhaoyingdong <zhaoyingdong@huawei.com>
 2021-01-05 07:48:27 -05:00
Marc Chevrier
f5cdcd0606 Merge topic 'makefiles-custom_command-depfile' 
3eacf857e3 Tests: Add case for DEPFILE in add_custom_command
cfd8a5ac1f Makefiles: Add support of DEPFILE for add_custom_command
a526f71266 cmGccDepfileReader: Add new function ensuring paths are valid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5617
 2020-12-26 05:55:55 -05:00
Craig Scott
ef5b3eff4e Merge topic 'xcode-inherit-paths' 
5115e8b2b6 Xcode: Generalize inheritance of project-level search paths
6b6230b23b cmGlobalXCodeGenerator: Factor out helper to append attribute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5637
 2020-12-23 19:11:21 -05:00
Marc Chevrier
3eacf857e3 Tests: Add case for DEPFILE in add_custom_command 
Issue: #20286, #21415
 2020-12-23 15:47:56 +01:00
Marc Chevrier
cfd8a5ac1f Makefiles: Add support of DEPFILE for add_custom_command 
Issue: #20286
Fixes: #21415
 2020-12-23 15:47:46 +01:00
Craig Scott
88eefaac04 Merge topic 'fc-relative-SOURCE_DIR' 
51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5641
 2020-12-22 15:49:37 -05:00
Brad King
72a28635b8 Merge topic 'issue-20134' 
b68699b717 target_include_directories: Support AFTER option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5633
 2020-12-22 09:13:08 -05:00
Brad King
3cf1a8c59b Merge topic 'issue-15653' 
c3385dd8bd file(GENERATE): Support options to manipulate file permissions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5437
 2020-12-22 09:12:20 -05:00
Brad King
5115e8b2b6 Xcode: Generalize inheritance of project-level search paths 
Generalize the change from commit bffb17be3d (Xcode: Inherit target
library and framework search paths from project, 2020-11-04,
v3.19.0-rc3~4^2) to apply to framework and other kinds of search paths
added either for include directories or for linking.

Issue: #21617
 2020-12-22 08:56:26 -05:00
Craig Scott
51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error 
Fixes: #21624
 2020-12-22 11:09:18 +11:00
Brad King
05a59f37ab Merge topic 'ctest-test-dir' 
dbcf86d24d Ctest: Support build tree on command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5623
 2020-12-21 10:04:58 -05:00
Asit Dhal
c3385dd8bd file(GENERATE): Support options to manipulate file permissions 
Fixes: #15653
 2020-12-21 12:16:16 +01:00
Asit Dhal
b68699b717 target_include_directories: Support AFTER option 
Fixes: #20134
 2020-12-19 14:51:39 +01:00
Brad King
6d7621baea Merge topic 'qt-autogen-per-config' 
20e4db4a66 cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specific
92d7b456e5 Autogen: Add support for per-config sources
3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5624
 2020-12-17 13:22:40 -05:00
Asit Dhal
dbcf86d24d Ctest: Support build tree on command line 
Fixes: #21268
 2020-12-17 05:01:03 +01:00
Brad King
92d7b456e5 Autogen: Add support for per-config sources 
Fixes: #20682
 2020-12-16 14:04:30 -05:00
Craig Scott
d2456b29f4 Merge topic 'unity-anon-ns' 
0fe9c40494 Unity Build: Add option for generating per-file unique id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4784
 2020-12-16 07:40:41 -05:00