mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-28 03:38:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,084 Commits 2 Branches 391 Tags
e4034eabe930fb677fb9b5c65cf29336d1ff123c
Commit Graph

51084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
e4034eabe9 cmLocalGenerator: Re-order logic in CreateGeneratedSource 
Return early on errors to reduce nesting.
 2020-12-10 07:06:20 -05:00
Brad King
706c48301d cmCustomCommandGenerator: Treat relative outputs w.r.t. build dir 
The `add_custom_command` and `add_custom_target` commands already do
this for plain output and byproduct paths.  Perform the same conversion
for such paths discovered after generator expression evaluation too.
 2020-12-10 07:06:20 -05:00
Brad King
5d23c5446e cmCustomCommandGenerator: Refactor OUTPUT and DEPENDS path evaluation 
* Use value semantics.
* Normalize paths in a separate loop.
* If CollapseFullPath is used, ConvertToUnixSlashes is unnecessary.
 2020-12-10 07:06:20 -05:00
Brad King
24156c0269 cmCustomCommandGenerator: Evaluate generator expressions in outputs 
This was already done for byproducts by commit a583b7bc17 (Genex:
Evaluate byproduct generator expressions in cmCustomCommandGenerator,
2019-09-11, v3.16.0-rc1~86^2).  Like that commit, this does not actually
expose the feature to projects because the front-end commands still
reject generator expressions.

Issue: #12877
 2020-12-10 07:06:20 -05:00
Brad King
b285748f79 cmAddCustom{Command,Target}Command: Skip conversions on genex paths 
If an output or byproduct path starts in a generator expression, do not
convert it to a full path yet.  That will have to be done at generate
time after evaluating the generator expressions.

Also update the `add_custom_target` byproduct path conversion added by
commit 445ff5ccdf (Byproducts: collapse full paths of custom target
byproducts, 2019-09-11, v3.16.0-rc1~103^2~1) to match the behavior of
`add_custom_command` when a path starts in a generator expression.
 2020-12-10 07:06:20 -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
0a2bb18719 Merge topic 'cmake.el' 
54b409094d cmake-mode.el: Improve help display with reStructuredText mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jostein Kjønigsen <jostein@kjonigsen.net>
Merge-request: !5575
 2020-12-10 06:59:32 -05:00
Brad King
86157e219d Merge topic 'EML-Support' 
d6df83a690 Find{BLAS,LAPACK}: Add support for Elbrus Math Library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5590
 2020-12-10 06:58:51 -05:00
Brad King
ff7f4e0b53 Merge branch 'release-3.19' 2020-12-10 06:57:54 -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
ea77dbcaf8 Merge branch 'release-3.19' 2020-12-10 06:57:04 -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
Kitware Robot
7d4a6ce714 CMake Nightly Date Stamp 2020-12-10 00:01:09 -05:00
Brad King
55193c8013 ci: Hard-code XCTest deployment target to 10.15 
Avoid using the macOS version running on the CI job host that happens
to run the build job.
 2020-12-09 13:28:52 -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
3c68404c20 Merge topic 'xcode-ios-empty-sticker-pack' 
0a60d1b6b4 Allow empty source file list for iOS Sticker packs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5587
 2020-12-09 09:16:34 -05:00
Brad King
2236e910b6 Merge topic 'gen-vs-intel-dpcpp-compiler-support' 
7808cbd644 CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5579
 2020-12-09 09:15:49 -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
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
Igor S. Gerasimov
d6df83a690 Find{BLAS,LAPACK}: Add support for Elbrus Math Library 
http://mossigplan.acm.org/EML_introduction_engl.pdf
 2020-12-09 16:49:41 +03:00
Kitware Robot
d5b12ddcbc CMake Nightly Date Stamp 2020-12-09 00:01:14 -05:00
Kyle Edwards
1080935732 AutoGen: Account for CMP0116 in the depfile 
Fixes: #21467
 2020-12-08 14:51:36 -05:00
Brad King
287c591079 cmake -E: Fix cmake_transform_depfile escaping of transformed paths 
In commit b2c14bc774 (cmake -E: Add cmake_transform_depfile internal
command, 2020-10-02) we forgot to use `WriteFilenameGcc` in one place.
 2020-12-08 14:51:36 -05:00
condy
54b409094d cmake-mode.el: Improve help display with reStructuredText mode 
Many of the `cmake --help-*` options print `.rst` source documents
with only partial evaluation.  View them in the Emacs `rst-mode`.
 2020-12-09 01:21:38 +08: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
Raul Tambre
af7e1545c8 CUDA, CXX: Remove HAS_FULL_SUPPORT for C++17 and 20 
CMake has no features for C++ versions past 14 and it seems unlikely we'd want
to add any.
Remove the related code.
 2020-12-08 18:42:24 +02:00
Haibo Huang
1a4b1cca1c Android: update documentation for NDK integration 2020-12-08 10:46:55 -05:00
Brad King
7775cbdb82 Merge topic 'range-for-avoid-tmp-warning' 
99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5578
 2020-12-08 10:21:33 -05:00
Brad King
7e83dc0764 Merge branch 'release-3.19' 2020-12-08 10:20:12 -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
c4fe3d00b5 Merge branch 'release-3.18' 2020-12-08 10:19:13 -05:00
Brad King
d506c73a54 Merge branch 'release-3.19' 2020-12-08 10:18:29 -05:00
Brad King
6412d17b4f Merge topic 'FindPython-python2-soabi-suffix-fix' 
afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5574
 2020-12-08 10:18:29 -05:00
Brad King
61cd587ef3 Merge topic 'FindPython-python2-soabi-suffix-fix' into release-3.19 
afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5574
 2020-12-08 10:18:28 -05:00
Brad King
1cb30467a3 Merge branch 'release-3.19' 2020-12-08 10:17:34 -05:00
Brad King
d00d5ac0cd Merge topic 'correct_ispc_path_computation' into release-3.19 
9af93fef11 ISPC: Handle OBJECT sources in different directories
72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5581
 2020-12-08 10:17:33 -05:00
Brad King
60d95fe2c2 Merge topic 'correct_ispc_path_computation' 
9af93fef11 ISPC: Handle OBJECT sources in different directories
72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5581
 2020-12-08 10:17:33 -05:00
Brad King
cc14733044 Merge branch 'release-3.19' 2020-12-08 10:16:21 -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
6aa3c3206e Merge topic 'remove-partial-intel-compiler-support' into release-3.19 
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:20 -05:00
Kitware Robot
f970f4c301 CMake Nightly Date Stamp 2020-12-08 00:01:11 -05:00
Craig Scott
99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for 2020-12-08 08:32:30 +11: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
Brad King
f0babb53b3 Revert "Intel: Add Intel Clang compiler identification" 
Revert commit 5c3a93ab88 (Intel: Add Intel Clang compiler
identification, 2020-09-29, v3.19.0-rc1~68^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.

Issue: #21551
 2020-12-07 10:46:22 -05:00