mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
50,095 Commits 2 Branches 385 Tags
7074b4c08cc1193598bfe17204fa8d5803f18dce
Commit Graph

50095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
7074b4c08c Help/dev: Add maintainer guide steps for CI packaging pipeline updates 2020-10-01 12:16:24 -04:00
Brad King
0519db374c Merge topic 'ci-linux-package' 
1853201bfa gitlab-ci: hide modern whitespace attribute usage from old Git versions
bd83c9f073 gitlab-ci: add jobs to make Linux release packages
46b1fc2387 gitlab-ci: rename package-pipeline jobs to end in "-package"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5286
 2020-10-01 08:46:13 -04:00
Brad King
2e8b85b040 Merge topic 'macos-arm64' 
b6c60f14b6 macOS: Default to arm64 architecture on Apple Silicon hosts
383e81aa60 Tests: Teach RunCMake to ignore Xcode internal objc warnings
8f75912176 Tests: Enable Assembler test case when CMAKE_OSX_ARCHITECTURES has one value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5291
 2020-10-01 08:45:13 -04:00
Brad King
cb8c51a08e Merge topic 'cmake-gui-reference-manual' 
0fe2ee3d43 CMake GUI: Add "CMake Reference Manual" help item
391ff1ec51 Refactor: Modernize cmSystemTools::FindCMakeResources()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5302
 2020-10-01 08:17:11 -04:00
Brad King
436b57ccb2 Merge topic 'genexpr-for-mfc-flag' 
c1f1eaf7a4 VS: Teach CMAKE_MFC_FLAG to support generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5283
 2020-10-01 07:59:33 -04:00
Brad King
b1e1cb2d0d Merge topic 'msvc_implib' 
7bda9a7fc7 VS: Make ImportLibary generation optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5282
 2020-10-01 07:58:09 -04:00
Brad King
95aa5c40cf Merge topic 'find_package-check-dir' 
2ff1693066 find_package: avoid showing files as directories when searching config files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5301
 2020-10-01 07:57:23 -04:00
Brad King
9fc742041b Merge topic 'intel-clang' 
5c3a93ab88 Intel: Add Intel Clang compiler identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5300
 2020-10-01 07:55:13 -04:00
Craig Scott
431f1183ef Merge topic 'FindPython-version_range' 
e4b7049230 FindPython: Add version range support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5265
 2020-10-01 07:43:38 -04:00
Ben Boeckel
1853201bfa gitlab-ci: hide modern whitespace attribute usage from old Git versions 
The old Git doesn't understand our new `eol=` attribute usage, so make
it not care about the difference.
 2020-10-01 07:32:23 -04:00
Ben Boeckel
bd83c9f073 gitlab-ci: add jobs to make Linux release packages 
These reuse the doc artifacts as the macOS package does.
 2020-10-01 07:32:14 -04:00
Brad King
46b1fc2387 gitlab-ci: rename package-pipeline jobs to end in "-package" 2020-10-01 07:26:37 -04:00
Brad King
c70d083b43 Merge topic 'ci-continuous' 
4e08ce720b gitlab-ci: add sphinx job to continuous build
ff72dbfb14 gitlab-ci: configure rules to enable continuous builds of staged MRs
a7afd8d3b0 gitlab-ci: use separate rules for dependent jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5304
 2020-10-01 07:22:49 -04:00
Kitware Robot
47b569a858 CMake Nightly Date Stamp 2020-10-01 00:01:15 -04:00
Kyle Edwards
0fe2ee3d43 CMake GUI: Add "CMake Reference Manual" help item 
And switch the ordering of "Help" and "About".
 2020-09-30 16:17:31 -04:00
Kyle Edwards
391ff1ec51 Refactor: Modernize cmSystemTools::FindCMakeResources() 
Use cmStrCat(), cmStrLen(), and cmHasLiteralSuffix().
 2020-09-30 16:13:10 -04:00
Brad King
4e08ce720b gitlab-ci: add sphinx job to continuous build 2020-09-30 15:00:59 -04:00
Brad King
ff72dbfb14 gitlab-ci: configure rules to enable continuous builds of staged MRs 
Configure rules to allow jobs for continuous builds to be enabled on a
project that configures a specific branch this purpose.
 2020-09-30 15:00:56 -04:00
Brad King
a7afd8d3b0 gitlab-ci: use separate rules for dependent jobs 2020-09-30 14:29:20 -04:00
Andrey Starodubtsev
c1f1eaf7a4 VS: Teach CMAKE_MFC_FLAG to support generator expressions 2020-09-30 12:24:13 -04:00
Mark Jansen
7bda9a7fc7 VS: Make ImportLibary generation optional 
Fixes: #21180
 2020-09-30 12:11:54 -04:00
Brad King
b6c60f14b6 macOS: Default to arm64 architecture on Apple Silicon hosts 
Detect `arm64` hardware using a method that pierces Rosetta.  If
`CMAKE_OSX_ARCHITECTURES` is not set, pass explicit flags to the
toolchain to use `arm64` instead of letting the toolchain pick.

Fixes: #20989
 2020-09-30 11:58:44 -04:00
Brad King
383e81aa60 Tests: Teach RunCMake to ignore Xcode internal objc warnings 
Xcode on Apple Silicon warns:

    objc[...]: Class AMSupportURL... is implemented in both ...
    One of the two will be used. Which one is undefined.

Teach RunCMake to drop such lines before matching against expected
output.
 2020-09-30 11:58:44 -04:00
Brad King
d91c3e33cb Merge topic 'cmake_language-DEFER' 
e8b0359a43 cmake_language: Add signature to DEFER calls to later times
9880549405 cmake_language: Make all errors fatal
4f33f3dcff cmake_language(CALL): Accept empty ${var} expansions
4ebe9c4ce1 cmake_language(EVAL): Factor out internal helper
78ff24a3a7 Help: Use singular placeholder name in cmake_language signature
edd60d4419 Tests: Simplify RunCMake.cmake_language invalid command cases
1a5bf8245e cmMakefile: Clarify name of internal list file run method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5262
 2020-09-30 11:55:33 -04:00
sanchayanghosh
2ff1693066 find_package: avoid showing files as directories when searching config files 
Teach `cmFileListGeneratorBase::Consider` to skip non-directories so
that all call sites get the check.

Fixes: #21212
 2020-09-30 11:50:23 -04:00
Marc Chevrier
e4b7049230 FindPython: Add version range support 
Fixes: #21107
 2020-09-30 14:30:23 +02:00
Craig Scott
f002c1cfc7 Merge topic 'find-package-check-empty-version-range' 
212b0afb66 find_package: raise error on empty version range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5294
 2020-09-30 08:22:49 -04:00
Brad King
1c3244ca30 Merge topic 'vs-mixed-lang-std' 
b325484928 VS: Fix C language standard in target with C++ sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5295
 2020-09-30 08:10:34 -04:00
Brad King
c297b61779 Merge topic 'update-kwsys' 
2132f2d49b Merge branch 'upstream-KWSys' into update-kwsys
eaf37ffde9 KWSys 2020-09-29 (4a19ed43)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5293
 2020-09-30 08:09:54 -04:00
Brad King
36035559cc Merge topic 'ci-src-package' 
448b411d99 gitlab-ci: add a job to upload source packages
45633a6297 gitlab-ci: add a job to make source packages
17decc4691 gitlab-ci: re-organize packaging pipeline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5297
 2020-09-30 08:09:10 -04:00
Brad King
a7624adecf Merge branch 'release-3.18' 2020-09-30 08:06:58 -04:00
Brad King
676571afe0 Merge topic 'cxx-as-objcxx' 
8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5296
 2020-09-30 08:06:57 -04:00
Brad King
848eb295de Merge topic 'cxx-as-objcxx' into release-3.18 
8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5296
 2020-09-30 08:06:57 -04:00
Brad King
7fb1c5bbe8 Merge branch 'release-3.18' 2020-09-30 08:05:50 -04:00
Brad King
d4c149a738 Merge topic 'cuda-11.1-sm86' into release-3.18 
5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5292
 2020-09-30 08:05:50 -04:00
Brad King
21b6b13956 Merge topic 'cuda-11.1-sm86' 
5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5292
 2020-09-30 08:05:50 -04:00
Kitware Robot
e3ae4061cd CMake Nightly Date Stamp 2020-09-30 00:02:17 -04:00
Brad King
e8b0359a43 cmake_language: Add signature to DEFER calls to later times 
Fixes: #19575
 2020-09-29 17:12:33 -04:00
Harini Chilamantula
5c3a93ab88 Intel: Add Intel Clang compiler identification 
The compiler identifies itself with the `__INTEL_CLANG_COMPILER`
preprocessor definition.
 2020-09-29 17:00:43 -04:00
Cristian Adam
8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx 
In commit 8d61294c3e (PCH: Mark CMake PCH source files as -x
<lang>-header, 2020-09-04, v3.18.3~14^2) we removed the explicit `-x
objective-c++` flag.  This broke cases with custom source extensions.

Restore the explicit `-x objective-c[++]` flag and put it before the
`<FLAGS>` placeholder.  The latter will contain the proper `-x
objective-c[++]-header` value and will override the `-x objective-c[++]`
value set before.

Fixes: #21234
 2020-09-29 12:35:49 -04:00
Brad King
448b411d99 gitlab-ci: add a job to upload source packages 2020-09-29 11:19:08 -04:00
Brad King
45633a6297 gitlab-ci: add a job to make source packages 2020-09-29 11:18:45 -04:00
Brad King
17decc4691 gitlab-ci: re-organize packaging pipeline 
Move the macOS package build job into the `build` stage.  Since it
depends on the sphinx doc package job, add a preceding `prep` stage.
 2020-09-29 11:13:14 -04:00
Brad King
9880549405 cmake_language: Make all errors fatal 2020-09-29 10:00:24 -04:00
Brad King
4f33f3dcff cmake_language(CALL): Accept empty ${var} expansions 
Factor out an internal helper.  Generalize partial argument expansion
and call the helper on a clean boundary between raw arguments.
 2020-09-29 10:00:24 -04:00
Brad King
4ebe9c4ce1 cmake_language(EVAL): Factor out internal helper 2020-09-29 10:00:24 -04:00
Brad King
78ff24a3a7 Help: Use singular placeholder name in cmake_language signature 2020-09-29 10:00:23 -04:00
Kyle Edwards
af048185b1 Merge topic 'cmake-gui-environment' 
85f5009d27 CMake GUI: Add environment editor
d6c051c126 Tests: Add some basic configure tests for the CMake GUI
7cd95d9996 Tests: Add CatchShow helper for CMake GUI tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5270
 2020-09-29 09:51:22 -04:00
Brad King
b325484928 VS: Fix C language standard in target with C++ sources 
Add C-language standard to target-wide C++ settings.

Fixes: #21195
 2020-09-29 07:26:36 -04:00
Marc Chevrier
212b0afb66 find_package: raise error on empty version range 2020-09-29 13:06:09 +02:00