mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,279 Commits 2 Branches 401 Tags
4ea3a8862503985222e3e85eeea752a719c03cc2
Commit Graph

8179 Commits

Author SHA1 Message Date
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 ddd52aac54 Merge topic 'test-ConfigSources-config' 
3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5643
 2020-12-22 13:49:29 -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
Brad King 3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE 
The test requires a non-empty `CMAKE_BUILD_TYPE` to function on
single-config generators.  Force a non-empty configuration if the test
is configured explicitly with empty `-DCMAKE_BUILD_TYPE=`.
 2020-12-21 21:27:35 -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 9ab77201f7 Apple: Fix linking to frameworks that do not exist until build time 
Fixes: #21621
 2020-12-21 11:50:54 -05: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
Brad King 3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators 2020-12-16 10:09:09 -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
Brad King 34469a4f71 Merge topic 'custom-command-output-genex-nmc' 
1526ae3aba Tests: Add cases for Ninja Multi-Config cross-config custom commands
dcf9f4d2f7 Ninja Multi-Config: Add support for cross-config custom commands
15467f12f7 cmLocalGenerator: Adopt custom target 'force' output name generation
7b64b0cd5a cmLocalGenerator: Refactor custom command generator construction
d29da8ed3e cmMakefile: Simplify custom target 'force' output name generation
2b1cc175ee Help: Clarify version adding add_custom_{command,target} OUTPUT genex support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5612
 2020-12-16 06:20:39 -05:00
Brad King 1526ae3aba Tests: Add cases for Ninja Multi-Config cross-config custom commands 2020-12-15 08:17:55 -05:00
Brad King 807c903c55 Merge topic 'issue-20915' 
6d0712c225 file(configure): Order of named options should be specified in any order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5608
 2020-12-15 07:43:36 -05:00
Brad King 38acdc5d3a Merge topic 'issue-21557-test-cases' 
8851637e9f cmake_policy: Implement test cases for cmake_policy VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5610
 2020-12-15 07:42:56 -05:00
Brad King 7932e0a46e Merge topic 'ispc_control_header_suffixes' into release-3.19 
c9a50f3556 ISPC: Generated Headers suffix configurable with a better default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5597
 2020-12-15 07:40:34 -05:00
Brad King 67f12dd1d6 Merge topic 'ispc_control_header_suffixes' 
c9a50f3556 ISPC: Generated Headers suffix configurable with a better default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5597
 2020-12-15 07:40:34 -05:00
Kyle Edwards dcf9f4d2f7 Ninja Multi-Config: Add support for cross-config custom commands 
Co-Author: Brad King <brad.king@kitware.com>
 2020-12-15 07:01:21 -05:00
Stephen Kelly 0fe9c40494 Unity Build: Add option for generating per-file unique id 
Fixes: #21477
 2020-12-15 22:26:09 +11:00
Marc Chevrier 55c3b6a77e CMakePackageConfigHelpers: Relax restrictions on version range 2020-12-15 09:24:09 +11:00
Robert Maynard c9a50f3556 ISPC: Generated Headers suffix configurable with a better default 
The target property `ISPC_HEADER_SUFFIX` and associated global
variable now can control the suffix used when generating the
C/C++ interoperability ISPC headers.

In addition the default suffix is now "_ispc.h" which matches the
common convention that the ISPC compiler team uses and recommends.
 2020-12-14 13:13:09 -05:00
Marc Chevrier 7f44760991 CMakePackageConfigHelpers: Relax restrictions on version range 2020-12-14 14:42:26 +01:00
Brad King fedfe763ee Merge topic 'custom-command-output-genex' 
c257c25419 add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTS
f36af9228b cmLocalGenerator: Evaluate generator expressions in custom command outputs
c887cefd9a cmLocalGenerator: Simplify custom command output cmSourceFile creation
947ba01bf9 cmLocalGenerator: Factor out helper to expand custom command output paths
1902d28ebc cmLocalGenerator: Refactor UpdateOutputToSourceMap to avoid boolean trap
e4034eabe9 cmLocalGenerator: Re-order logic in CreateGeneratedSource
706c48301d cmCustomCommandGenerator: Treat relative outputs w.r.t. build dir
5d23c5446e cmCustomCommandGenerator: Refactor OUTPUT and DEPENDS path evaluation
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5402
 2020-12-14 07:22:45 -05:00
Brad King 04ed1e73dd Merge topic 'execute_process-command-error' into release-3.19 
e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5588
 2020-12-14 07:07:46 -05:00
Brad King 922ad5c6b9 Merge topic 'execute_process-command-error' 
e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5588
 2020-12-14 07:07:46 -05:00
Asit Dhal 8851637e9f cmake_policy: Implement test cases for cmake_policy VERSION 2020-12-14 04:55:03 +01:00
Asit Dhal 6d0712c225 file(configure): Order of named options should be specified in any order 
Fixes: #20915
 2020-12-13 09:45:11 +01:00
Brad King 794aa36b1f Merge topic 'apple-silicon-host-arch' 
b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5589
 2020-12-11 13:05:34 -05:00
Brad King c257c25419 add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTS 
Move rejection of `#`, `<`, and `>` characters in outputs and byproducts
to a generate-time check.  This removes the front-end check that
disallowed generator expressions.  The generators have already been
updated to handle them.

Fixes: #12877
 2020-12-11 08:24:21 -05:00
Brad King b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts 
Add test cases verifying that `CMAKE_APPLE_SILICON_PROCESSOR` set as
either a cache or environment variable causes that to be selected as the
host architecture.  Also verify that sources compile using whatever is
selected as the host architecture, even when the explicit setting is not
used.

Issue: #21554
 2020-12-10 12:08:15 -05:00
Brad King 9109475bfb Merge topic 'cpp23' 
9f3c70a333 CUDA, CXX, OBJCXX: C++23 support with Clang 12
af7e1545c8 CUDA, CXX: Remove HAS_FULL_SUPPORT for C++17 and 20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5576
 2020-12-10 07:00:17 -05:00
Brad King 419adf0eef Merge topic 'test-macos-version' 
55193c8013 ci: Hard-code XCTest deployment target to 10.15
40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3
c404d7f221 Tests: Add cache entry to control XCTest deployment target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5593
 2020-12-10 06:57:54 -05:00
Brad King 020e1e2031 Merge topic 'test-macos-version' into release-3.19 
55193c8013 ci: Hard-code XCTest deployment target to 10.15
40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3
c404d7f221 Tests: Add cache entry to control XCTest deployment target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5593
 2020-12-10 06:57:53 -05:00
Brad King 9f66eb74a5 Merge topic 'ispc-system-includes' into release-3.19 
8da25e4a3c ISPC: Treat system includes as '-I' includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5591
 2020-12-10 06:57:04 -05:00
Brad King e966c23be2 Merge topic 'ispc-system-includes' 
8da25e4a3c ISPC: Treat system includes as '-I' includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5591
 2020-12-10 06:57:04 -05:00
Asit Dhal e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios 
1.  COMMAND_ERROR_IS_FATAL ANY will capture errors if the exit code is
    non zero, there is a timeout or an abnormal exit.

2.  COMMAND_ERROR_IS_FATAL LAST
    will capture if only the last process has an exit code non zero, there
    is a timeout or an abnormal exit.

Fixes: #21562
 2020-12-10 06:09:59 -05:00
Brad King 40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3 2020-12-09 13:10:44 -05:00
Brad King c404d7f221 Tests: Add cache entry to control XCTest deployment target 2020-12-09 13:10:17 -05:00
Robert Maynard 8da25e4a3c ISPC: Treat system includes as '-I' includes 
ISPC doesn't have specific syntax for system includes.
 2020-12-09 11:33:44 -05:00
Brad King acc9c89914 Merge topic 'cmp0116-automoc' 
1080935732 AutoGen: Account for CMP0116 in the depfile
287c591079 cmake -E: Fix cmake_transform_depfile escaping of transformed paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5584
 2020-12-09 09:14:00 -05:00
Kyle Edwards 1080935732 AutoGen: Account for CMP0116 in the depfile 
Fixes: #21467
 2020-12-08 14:51:36 -05:00