mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 16:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,311 Commits 2 Branches 386 Tags
0dcc03cd162d4c93c66ea8eaf3067702e7b1f461
Commit Graph

4875 Commits

Author SHA1 Message Date
Brad King
522015e04f Merge topic 'java-export-native_headers' 
53235626a2 UseJava: enable exportation of native headers target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5658
 2021-01-05 09:02:12 -05:00
Brad King
4d70299c66 Merge topic 'clang_win32_subsystem' 
acfb54bb2f Clang: Support WIN32_EXECUTABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5648
 2021-01-04 13:49:23 -05:00
fazl
b42a63605c Tutorial: Fix minor typo in index.rst 
s/mqsqrt.h/mysqrt.h/
 2021-01-04 12:02:09 -05:00
Marc Chevrier
53235626a2 UseJava: enable exportation of native headers target 2020-12-29 17:14:20 +01: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
Marc Chevrier
cfd8a5ac1f Makefiles: Add support of DEPFILE for add_custom_command 
Issue: #20286
Fixes: #21415
 2020-12-23 15:47:46 +01:00
Raul Tambre
acfb54bb2f Clang: Support WIN32_EXECUTABLE 
Fixes #21613.
 2020-12-23 12:39:09 +02:00
Brad King
7cf6941f37 Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64 2020-12-22 14:05:43 -05:00
Brad King
2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary 2020-12-22 14:04:39 -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
3f85a95978 Merge topic 'doc-add_test-config-genex' 
af7882ba6e Help: replace deprecated $<CONFIGURATION> generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5636
 2020-12-22 09:11:32 -05:00
NeroBurner
af7882ba6e Help: replace deprecated $<CONFIGURATION> generator expression 
The `$<CONFIGURATION>` genex has been deprecated since CMake 3.0.
Use `$<CONFIG>` instead in the `add_test` example.
 2020-12-21 13:54:25 -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
Craig Scott
63ff43fc9e Merge topic 'doc-fix-XCODE_LINK_BUILD_PHASE_MODE' 
2d84b9d145 Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5634
 2020-12-21 06:03:38 -05:00
Craig Scott
2d84b9d145 Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE 2020-12-20 20:13:23 +11: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
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
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
Brad King
2b1cc175ee Help: Clarify version adding add_custom_{command,target} OUTPUT genex support 
Update the documentation added by commit c257c25419
(add_custom_{command,target}: Add genex support to OUTPUT and
BYPRODUCTS, 2020-10-19) to use sphinx markup instead of prose to specify
the version in which the feature was added.
 2020-12-15 07:00:20 -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
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
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
Guillem Vela
1f41eb8472 Help: Fix small typos in documentation 2020-12-14 07:18:47 -05:00
Brad King
23df57a3a7 Merge topic 'apple-silicon-host-arch' into release-3.19 
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
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
3765a415df Merge branch 'master' into doc-3_19_release-fixes 2020-12-11 10:39:14 -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
Craig Scott
ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language() 
Fixes: #21586
 2020-12-11 18:25:42 +11:00
Craig Scott
b4c02a0a1d Help: Re-sort indexes in the manuals 2020-12-11 11:19:04 +11:00
Craig Scott
2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized 2020-12-11 11:19:04 +11:00
Craig Scott
0816482302 Help: xref variable that cmake_minimum_required() sets 
The CMAKE_MINIMUM_REQUIRED_VERSION has long been set by
the cmake_minimum_required() command, but the command docs
never mentioned this. Only the variable's own docs stated this but
the variable isn't very discoverable without it being mentioned in
the command's docs as well.
 2020-12-11 11:19:04 +11:00
Brad King
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts 
Since commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple
Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we use `sysctl` to detect
that we are running on Apple Silicon in a way that pierces Rosetta.
This always sets `CMAKE_HOST_SYSTEM_PROCESSOR` to be `arm64` on such
hosts.  However, macOS offers strong support for running processes under
an emulated `x86_64` architecture.

Teach CMake to select either `arm64` or `x86_64` as the host
architecture on Apple Silicon based on the architecture of its own
process.  When CMake is built as a universal binary, macOS will select
whichever slice (architecture) is appropriate under the user's shell,
and `CMAKE_HOST_SYSTEM_PROCESSOR` will match.

Also offer a `CMAKE_APPLE_SILICON_PROCESSOR` variable and environment
variable to provide users with explicit control over the host
architecture selection regardless of CMake's own architecture.

Finally, if `CMAKE_OSX_ARCHITECTURES` is not set, pass explicit flags to
the toolchain to use selected host architecture instead of letting the
toolchain pick.

Fixes: #21554
 2020-12-10 12:08:13 -05:00
Brad King
fd6c1e5a73 Merge topic 'rel-macos-apple-silicon' 
56a075eb5d ci: update macOS package to produce universal binaries
b184cc256b ci: do not use sccache for macOS packaging
41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5595
 2020-12-10 12:05:17 -05:00
Brad King
56a075eb5d ci: update macOS package to produce universal binaries 
Update our deployment target to macOS 10.10.
This is required by Qt 5.9.

Fixes: #21565
Issue: #20825
 2020-12-10 10:55:17 -05:00
Brad King
c523d1cc32 Help: Add examples to add_custom_command reference documentation 2020-12-10 07:06:19 -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
a2f98803f0 Merge topic 'android-docs' 
1a4b1cca1c Android: update documentation for NDK integration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5586
 2020-12-09 09:15:13 -05:00
Raul Tambre
9f3c70a333 CUDA, CXX, OBJCXX: C++23 support with Clang 12 
Clang 12 landed initial support for C++23 language mode flag -std={c|gnu}++2b
in commit 6627a3c2873fdf7ccba1a1573371079be48b36e8.
 2020-12-08 18:43:59 +02:00
Haibo Huang
1a4b1cca1c Android: update documentation for NDK integration 2020-12-08 10:46:55 -05:00
Brad King
c4feb00aa5 Merge topic 'update_cmp112' 
cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5582
 2020-12-08 10:20:12 -05:00
Brad King
8a3ecb484f Merge topic 'update_cmp112' into release-3.19 
cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5582
 2020-12-08 10:20:11 -05:00
Brad King
f200ac1304 Merge topic 'remove-partial-intel-compiler-support' 
41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification"
f0babb53b3 Revert "Intel: Add Intel Clang compiler identification"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !5583
 2020-12-08 10:16:21 -05:00
Brad King
41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification" 
Revert commit 887f3a88a6 (Intel: Add Intel DPC++ compiler
identification, 2020-09-21, v3.19.0-rc1~124^2).  The compiler has
already been released, and is more usable with CMake by pretending to be
upstream Clang than by identifying it as a compiler for which we have
not implemented support.

Fixes: #21551
 2020-12-07 10:46:27 -05:00