mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 01:09:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,060 Commits 2 Branches 392 Tags
3c68404c20d05cb34a32a95a95d59fd1019dbb44
Commit Graph

51060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Brad King
41ec2a4fac Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18 
Merge-request: !5574
 2020-12-07 10:38:23 -05:00
Brad King
e94f00dfe3 Merge topic 'get_dir_prop_arg_parsing' 
ab1ee5aab8 get_directory_property: Check for empty or missing property name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5577
 2020-12-07 10:29:16 -05:00
Brad King
70c9a3e294 Merge topic 'asm_arch' into release-3.19 
fcabf4a47e macOS: Add architecture flags only for native ASM dialect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5572
 2020-12-07 10:28:18 -05:00
Brad King
a0a49349ee Merge branch 'release-3.19' 2020-12-07 10:28:18 -05:00
Brad King
afd495decd Merge topic 'asm_arch' 
fcabf4a47e macOS: Add architecture flags only for native ASM dialect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5572
 2020-12-07 10:28:18 -05:00
Robert Maynard
cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt> 
Fixes #21559
 2020-12-07 09:50:39 -05:00
Robert Maynard
9af93fef11 ISPC: Handle OBJECT sources in different directories 2020-12-07 09:14:54 -05:00
Robert Maynard
72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location 2020-12-07 09:14:13 -05:00
Kitware Robot
a37ef1b3d4 CMake Nightly Date Stamp 2020-12-07 00:01:17 -05:00
Andrew Shaitorov
0a60d1b6b4 Allow empty source file list for iOS Sticker packs 2020-12-06 11:31:26 -05:00
Nikita Sirgienko
7808cbd644 CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen 
Before Intel have only one compiler icl (Intel(R) C++ compiler) and
CMakeDetermineCompilerId has considered, that all toolchains with a word
"Intel" in the toolchain name is a icl compiler. But now Intel have also other
compiler - Intel(R) DPC++ compiler, which haven't working with cmake on
Visual Studio Generator because cmake try to use icl compiler, which cmake
can't found and because of this fails the configuration. This commit fix
this problem, and both compilers start to work correctly with
Visual Studio generator.

Fixes: #21546
 2020-12-06 14:20:21 +03:00
Kitware Robot
0ab0fe64ac CMake Nightly Date Stamp 2020-12-06 00:01:14 -05:00
Craig Scott
ab1ee5aab8 get_directory_property: Check for empty or missing property name 
Fixes: #21555
 2020-12-06 09:38:12 +11:00
Craig Scott
14576a40ac Merge topic 'remove-WCDH-module' 
da7ad7997e WriteCompilerDetectionHeader: Add policy to remove module
541f1410e0 Help: Move Documentation module to list of deprecated modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5573
 2020-12-05 06:23:55 -05:00
Brad King
da7ad7997e WriteCompilerDetectionHeader: Add policy to remove module 
See justification in the policy documentation.

Closes: #17842
 2020-12-05 21:57:08 +11:00
Kitware Robot
2e8f8276c7 CMake Nightly Date Stamp 2020-12-05 00:01:12 -05:00
Ben Boeckel
afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI 
Commit 951640f1f9 (FindPython: manage SOABI for all Python versions,
2020-08-11) extended support for Python2's SOABI variable in order to
support the PyPy interpreter as well. This caused a regression in the
way that the SOABI variable was built up for the CPython interpreter.
This caused the variable to be set to `.so` which ended up causing a
doubling of the resulting `SOABI` variable in the end.

Co-Author: Marc Chevrier <marc.chevrier@gmail.com>
Fixes: #21548
 2020-12-04 14:01:27 -05:00
Brad King
541f1410e0 Help: Move Documentation module to list of deprecated modules 
The module has been deprecated since commit 306a1ba960
(Modules/Documentation: remove, 2020-04-16, v3.18.0-rc1~290^2).
 2020-12-04 10:52:03 -05:00
Brad King
74e1b36579 Merge topic 'test-CMP0118' 
43506037d2 Tests: Avoid unnecessary use of toolchain in RunCMake.CMP0118

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5571
 2020-12-04 10:50:52 -05:00
Raul Tambre
fcabf4a47e macOS: Add architecture flags only for native ASM dialect 
ASM dialects like NASM have languages names such as ASM_NASM.
However such ASM dialects don't support the architecture flags, so match only
the full name.

Fixes #21553.
 2020-12-04 17:29:14 +02:00
Brad King
486ede8064 Merge topic 'makefiles-compiler-deps-optims' 
f395caf498 Makefiles dependencies: enhance robustness of deps parser

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5568
 2020-12-04 08:31:58 -05:00
Brad King
bb4d70c165 Merge topic 'GoogleTest-disabled-underscore' 
dff56b0b97 GoogleTest: Match the full 'DISABLED_' prefix to disable tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !5567
 2020-12-04 08:30:40 -05:00
Brad King
a6ffbc2170 Merge topic 'test-git-default-branch' 
26ec2e2b0c Tests: Update CTest.UpdateGIT test for custom defaultBranch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5565
 2020-12-04 08:28:43 -05:00
Brad King
76685b985d Merge topic 'explicit-LANGUAGE-flag' 
48aac247e9 Compile with explicit language flag when source LANGUAGE property is set
2e67a75acd Embarcadero: Simplify addition of -P flag for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5522
 2020-12-04 08:27:55 -05:00