mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-19 12:50:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,454 Commits 2 Branches 396 Tags
026083f97b0898fedf5c36ffdf80b37ec9bc185f
Commit Graph

47454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
026083f97b Merge branch 'release-3.17' 2020-03-30 13:23:19 -04:00
Brad King
0055170b08 Merge topic 'docs-xcode-gen-scheme-workdir' 
6905451e11 Help: Add missing XCODE_SCHEME_WORKING_DIRECTORY
6ff07dac76 Help: Minor typos and formatting for XCODE_SCHEME_WORKING_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4543
 2020-03-30 13:23:19 -04:00
Brad King
04d8ed643c Merge topic 'docs-xcode-gen-scheme-workdir' into release-3.17 
6905451e11 Help: Add missing XCODE_SCHEME_WORKING_DIRECTORY
6ff07dac76 Help: Minor typos and formatting for XCODE_SCHEME_WORKING_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4543
 2020-03-30 13:23:18 -04:00
Brad King
04c7f8f9f3 Merge branch 'release-3.17' 2020-03-30 13:22:02 -04:00
Brad King
42cefc6bc1 Merge topic 'llvm_rc_pp' into release-3.17 
4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4535
 2020-03-30 13:22:02 -04:00
Brad King
0188df97e8 Merge topic 'llvm_rc_pp' 
4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4535
 2020-03-30 13:22:02 -04:00
Brad King
3c48f4b24b Merge topic 'FindPython-use-sysconfig-package' 
dd0664415a FindPython: use 'sysconfig' as alternate to 'distutils.sysconfig'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4540
 2020-03-30 09:42:35 -04:00
Kitware Robot
887eb6b768 CMake Nightly Date Stamp 2020-03-30 00:01:13 -04:00
Craig Scott
6905451e11 Help: Add missing XCODE_SCHEME_WORKING_DIRECTORY 2020-03-29 22:13:56 +11:00
Craig Scott
6ff07dac76 Help: Minor typos and formatting for XCODE_SCHEME_WORKING_DIRECTORY 2020-03-29 22:13:56 +11:00
Kitware Robot
371727cd58 CMake Nightly Date Stamp 2020-03-29 00:01:22 -04:00
Marc Chevrier
dd0664415a FindPython: use 'sysconfig' as alternate to 'distutils.sysconfig' 
To support any python installation, if package 'distutils.sysconfig'
is not available, try to use package 'sysconfig'.

Fixes: #20502
 2020-03-28 10:51:47 +01:00
Craig Scott
67e2fef722 Merge branch 'release-3.17' 2020-03-28 03:05:11 -04:00
Craig Scott
e5eb4108a0 Merge topic 'ninja-multi-doc-variable-update' into release-3.17 
c8fd26eb57 Help: Move Ninja Multi-Config variable details into their respective pages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4532
 2020-03-28 03:05:10 -04:00
Craig Scott
655b52af1d Merge topic 'ninja-multi-doc-variable-update' 
c8fd26eb57 Help: Move Ninja Multi-Config variable details into their respective pages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4532
 2020-03-28 03:05:10 -04:00
Kitware Robot
cc86c9279e CMake Nightly Date Stamp 2020-03-28 00:01:13 -04:00
Lucas Wang
4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path 
`CMAKE_RC_COMPILER_INIT` and `CMAKE_RC_COMPILER` can be set by user,
for example `llvm-rc-10` and `D:\LLVM\bin\llvm-rc.exe`.
 2020-03-27 08:54:58 -04:00
Brad King
f670435715 Merge topic 'pch-warn-invalid' 
2ce08e5489 PCH: add an option to disable `-Winvalid-pch`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4499
 2020-03-27 08:03:30 -04:00
Brad King
cc1d5a436b Merge topic 'doc-cmake-package-targets' 
e6344586ee install: Document caveat when EXPORT name matches package name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4527
 2020-03-27 07:58:39 -04:00
Brad King
d6119e2305 Merge topic 'cleanup-endls-1' 
3fdd8db3aa Refactor: Avoid `std::endl` where it's not necessary (part 1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4513
 2020-03-27 07:51:27 -04:00
Brad King
a6611577c3 Merge topic 'cmprop-getglobalprop' 
c84cf42897 cmState::GetGlobalProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4521
 2020-03-27 07:50:28 -04:00
Brad King
7e3d81b1df Merge topic 'cmprop-state' 
a7f2ff16a4 cmState::GetCacheEntryProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4522
 2020-03-27 07:49:30 -04:00
Brad King
ae96b772fa Merge topic 'export-error-on-multuple-calls' 
0cd20e8f62 export(): raise an error on multiple calls with same FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4510
 2020-03-27 07:48:30 -04:00
Brad King
767a875fee Merge branch 'release-3.17' 2020-03-27 07:46:15 -04:00
Brad King
0613f1b245 Merge topic 'ctest-timeout-report' 
3503a79639 Merge branch 'backport-ctest-timeout-report' into ctest-timeout-report
7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4530
 2020-03-27 07:46:15 -04:00
Brad King
b835c5d5c9 Merge topic 'ctest-timeout-report' into release-3.17 
7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4530
 2020-03-27 07:46:14 -04:00
Brad King
e50c02c009 Merge branch 'release-3.17' 2020-03-27 07:45:15 -04:00
Brad King
efb2a9f093 Merge topic 'vs-clangcl' into release-3.17 
f3d7a15010 VS: Fix ClangCL toolset compiler path detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
 2020-03-27 07:45:15 -04:00
Brad King
112cb248ae Merge topic 'vs-clangcl' 
f3d7a15010 VS: Fix ClangCL toolset compiler path detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
 2020-03-27 07:45:15 -04:00
Brad King
311848f790 Merge topic 'FindPython-variable-spelling-error' into release-3.17 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Brad King
9a585fc038 Merge branch 'release-3.17' 2020-03-27 07:44:12 -04:00
Brad King
83f5ba06df Merge topic 'FindPython-variable-spelling-error' 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Brad King
7a4cc3b9c3 Merge branch 'release-3.17' 2020-03-27 07:43:03 -04:00
Brad King
9df587168a Merge topic 'CheckIPOSupported-cleanup-cache' 
4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4528
 2020-03-27 07:43:03 -04:00
Brad King
f6c3820549 Merge topic 'CheckIPOSupported-cleanup-cache' into release-3.17 
4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4528
 2020-03-27 07:43:02 -04:00
Brad King
7489ac6f52 Merge branch 'release-3.17' 2020-03-27 07:41:58 -04:00
Brad King
184dd23d2e Merge topic 'nmc-cl-showincludes' 
6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4526
 2020-03-27 07:41:58 -04:00
Brad King
1915a09884 Merge topic 'nmc-cl-showincludes' into release-3.17 
6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4526
 2020-03-27 07:41:57 -04:00
Brad King
3ee4d19ec8 Merge branch 'release-3.17' 2020-03-27 07:39:30 -04:00
Brad King
a88b27bfc7 Merge topic 'llvm-rc-stderr' 
dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4525
 2020-03-27 07:39:30 -04:00
Brad King
2fe8ea555e Merge topic 'llvm-rc-stderr' into release-3.17 
dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4525
 2020-03-27 07:39:29 -04:00
Brad King
5a79394e96 Merge branch 'release-3.17' 2020-03-27 07:38:23 -04:00
Brad King
032df7ae7b Merge topic 'llvm-rc-depfile' into release-3.17 
2c724c3aea llvm-rc: Write depfile to location specified by the generator
4cc876540e llvm-rc: Select preprocessor from active languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4524
 2020-03-27 07:38:22 -04:00
Brad King
ab96bbff2c Merge topic 'llvm-rc-depfile' 
2c724c3aea llvm-rc: Write depfile to location specified by the generator
4cc876540e llvm-rc: Select preprocessor from active languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4524
 2020-03-27 07:38:22 -04:00
Brad King
a0b1463c26 Merge branch 'release-3.16' 2020-03-27 07:36:35 -04:00
Brad King
0af3a9b755 Merge topic 'make-nested-silent' into release-3.17 
d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4515
 2020-03-27 07:35:12 -04:00
Brad King
731b3903d4 Merge branch 'release-3.17' 2020-03-27 07:35:12 -04:00
Brad King
610759fa3e Merge topic 'make-nested-silent' 
d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4515
 2020-03-27 07:35:12 -04:00
Kitware Robot
b83696c04c CMake Nightly Date Stamp 2020-03-27 00:01:09 -04:00
Kyle Edwards
c8fd26eb57 Help: Move Ninja Multi-Config variable details into their respective pages 2020-03-26 15:33:48 -04:00