mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
50,070 Commits 2 Branches 385 Tags
116a427eb1aa7e603a80a50486c08cd0dd16d7dd
Commit Graph

50070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Asit Dhal
116a427eb1 execute_process: add options for fatal errors on subprocess failure 
Fixes: #19930
 2020-10-01 17:07:44 +02:00
Kitware Robot
47b569a858 CMake Nightly Date Stamp 2020-10-01 00:01:15 -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
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
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
Brad King
edd60d4419 Tests: Simplify RunCMake.cmake_language invalid command cases 2020-09-29 06:24:51 -04:00
Brad King
1a5bf8245e cmMakefile: Clarify name of internal list file run method 2020-09-29 06:03:15 -04:00
Brad King
39677de5e2 Merge topic 'simplify-execution-context' 
07c1bdda3d cmMakefile: Replace GetExecutionFilePath with the top of the Backtrace
727ed0c403 cmMakefile: Simplify ExpandArguments signature
e456dae669 cmConditionEvaluator: Remove extra copy of execution context
0100a4943e cmMakefile: Remove now-unused overload of GetBacktrace
dc49abcb89 if,while: Clarify condition backtrace construction
68af831505 cmMakefile: Inline GetExecutionContext at call sites
280f3918f3 cmMakefile: Simplify GetExecutionContext implementation
0e59b45dfc cmListFileCache: Add explicit constructors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5276
 2020-09-29 05:58:25 -04:00
Brad King
1382002ae2 Merge topic 'ctest_launch_report_make_errors' 
a8b7dd061b ctest: improve Unicode support for launchers
ab9ad2a6a0 ctest: report make-level errors to CDash when using launchers
56e4e942d2 ctest: split launcher XML writer into separate class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !5266
 2020-09-29 05:51:25 -04:00
Brad King
ede7a32ef6 Merge topic 'refactor-cmprop' 
c88dde2869 cmGeneratorTarget: internal refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5289
 2020-09-29 05:50:45 -04:00
Brad King
275c7be867 Merge topic 'return-cmprop' 
d298ae7470 cmake::GetCacheDefinition: Return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5288
 2020-09-29 05:49:48 -04:00
Brad King
a456dd6c26 Merge topic 'system_include_dir_caching_pre_lang' 
b6418155f3 cmGeneratorTarget: Include Cache now occurs per language+config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5274
 2020-09-29 05:48:11 -04:00
Brad King
0021d24fb3 Merge topic 'add_lang_agnostic_check_compile_flag_module' 
90dead024c CheckCompilerFlag: unified way to check compiler flags per language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5281
 2020-09-29 05:45:07 -04:00
Brad King
7d4e9a3a3a Merge topic 'vs-c11' into release-3.18 
b11c723678 VS: Populate `std:c{11,17}` flag table entries for v142

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5290
 2020-09-29 05:39:59 -04:00
Brad King
ce6f085f31 Merge branch 'release-3.18' 2020-09-29 05:39:59 -04:00
Brad King
27f3b75a7d Merge topic 'vs-c11' 
b11c723678 VS: Populate `std:c{11,17}` flag table entries for v142

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5290
 2020-09-29 05:39:59 -04:00
Brad King
59d84ab9f3 Merge topic 'update-guides' 
9b988d9e57 Help: Cleanup guides

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5280
 2020-09-29 05:38:55 -04:00
Brad King
9978889c56 Merge topic 'user-interaction-images' 
0aea38d25e Help: Change User Interaction image paths to be relative to source file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5279
 2020-09-29 05:37:44 -04:00
zasdfg bnm
5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support 2020-09-29 05:32:25 -04:00
Brad King
2132f2d49b Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-09-29 (4a19ed43)
 2020-09-29 05:22:13 -04:00
KWSys Upstream
eaf37ffde9 KWSys 2020-09-29 (4a19ed43) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 4a19ed432e73d9720244eb52799c4c0a54172eca (master).

Upstream Shortlog
-----------------

Deniz Bahadir (1):
      8bc06cf8 Regex: Double the maximal allowed size for a regex (to 2^{16}-1)
 2020-09-29 05:22:12 -04:00
Kitware Robot
cf2f440658 CMake Nightly Date Stamp 2020-09-29 00:01:15 -04:00
Brad King
b11c723678 VS: Populate std:c{11,17} flag table entries for v142 
The `-std:c11` option added by commit f7347f28c7 (MSVC: Record support
for C11 and c_restrict, 2020-08-09, v3.18.2~9^2) needs this flag table
entry to map in the VS IDE properly.

Issue: #21069
 2020-09-28 15:51:01 -04:00
vvs31415
c88dde2869 cmGeneratorTarget: internal refactoring 2020-09-28 10:37:25 -07:00
Zack Galbreath
a8b7dd061b ctest: improve Unicode support for launchers 
Fix launcher behavior for international characters in the path on Windows.
 2020-09-28 13:13:52 -04:00
Zack Galbreath
ab9ad2a6a0 ctest: report make-level errors to CDash when using launchers 
Fixes: #19545
 2020-09-28 13:13:52 -04:00
Zack Galbreath
56e4e942d2 ctest: split launcher XML writer into separate class 
This refactor will allow us to more easily add additional warnings and errors
to builds that use launchers.
 2020-09-28 13:13:52 -04:00
vvs31415
d298ae7470 cmake::GetCacheDefinition: Return cmProp 2020-09-28 09:32:22 -07:00
Brad King
dd0743fdf8 Merge topic 'ci-tweaks' 
e80362252f ci: support a max parallelism for tests
93a745683b sccache: use a different port for CMake builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5287
 2020-09-28 11:29:40 -04:00