Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity
52,104 Commits 2 Branches 375 Tags
a133a583d484028f8b03bd791ebea8ba0cf96b84
Commit Graph

52104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
a133a583d4 cmLocalGenerator: Clarify GetIncludeFlags signature 
Make the `config` argument non-optional so all callers must be explicit.
Convert the path style argument to an enumeration to make its role clear
at call sites.

The path style argument is implemented by `ConvertToIncludeReference`,
which was introduced with the Ninja generator by commit 5b114c9bee
(Introduce a cmLocalGenerator::ConvertToIncludeReference function,
2011-09-07, v2.8.7~187^2~4).  Its only purpose is to allow the Ninja
generator to use relative paths in `-I` flags.  Add a comment explaining
this role.
 2021-02-25 13:24:45 -05:00
Brad King
c99db71533 Merge branch 'release-3.20' 2021-02-25 10:52:35 -05:00
Brad King
304ed74dc3 Merge topic 'ci-xcode-12.4' 
85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5858
 2021-02-25 10:52:35 -05:00
Brad King
e53a73c6c9 Merge topic 'ci-xcode-12.4' into release-3.20 
85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5858
 2021-02-25 10:52:35 -05:00
Brad King
a5678e46f8 Merge topic 'runtime-dll-deps' 
f31e8d33ef Genex: Fix grammatical error in TARGET_OBJECTS error message
d34d28e688 Genex: Add TARGET_RUNTIME_DLLS genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5837
 2021-02-25 09:58:40 -05:00
Brad King
85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4 2021-02-25 09:09:12 -05:00
Brad King
c06a6ba61a Merge topic 'create-test-source-list-duplicate-decls' 
136608dfec cmCreateTestSourceList: avoid generating duplicate declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5856
 2021-02-25 09:04:20 -05:00
Brad King
4250c5f91b Merge topic 'cuda_clang_implicit' 
23753be1cc Clang/CUDA: Restore needed references to implicit link variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5855
 2021-02-25 09:03:07 -05:00
Brad King
60280f0d99 Merge topic 'nvhpc-minor-fixes' into release-3.20 
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION
6bfb2c6175 HELP: Update compile-features documentation with missing compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5857
 2021-02-25 09:02:02 -05:00
Brad King
3c7926ab6a Merge branch 'release-3.20' 2021-02-25 09:02:02 -05:00
Brad King
6288974ba5 Merge topic 'nvhpc-minor-fixes' 
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION
6bfb2c6175 HELP: Update compile-features documentation with missing compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5857
 2021-02-25 09:02:02 -05:00
Kitware Robot
12cc87281f CMake Nightly Date Stamp 2021-02-25 00:01:15 -05:00
Kyle Edwards
f31e8d33ef Genex: Fix grammatical error in TARGET_OBJECTS error message 2021-02-24 14:55:17 -05:00
Kyle Edwards
d34d28e688 Genex: Add TARGET_RUNTIME_DLLS genex 
Co-Authored-by: Brad King <brad.king@kitware.com>
 2021-02-24 14:55:17 -05:00
Robert Maynard
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION 
The PGI ( and NVIDIA HPC ) compilers default C++ standard level
are based on the GCC system headers it is compiling against.

Therefore on newer platforms the default C++ level will be >= 11
and requesting C++98 compilation mode will fail as no explicit
flag will be set.
 2021-02-24 13:47:03 -05:00
Ben Boeckel
136608dfec cmCreateTestSourceList: avoid generating duplicate declarations 
This avoids warnings with `clang-tidy`'s
`-readability-redundant-declaration` lint in generated source code.
 2021-02-24 13:33:28 -05:00
Robert Maynard
6bfb2c6175 HELP: Update compile-features documentation with missing compilers 2021-02-24 13:09:59 -05:00
Brad King
e742cf2c17 Merge branch 'release-3.20' 2021-02-24 12:17:02 -05:00
Brad King
498b7da2e4 CMake 3.20.0-rc2 v3.20.0-rc2 2021-02-24 11:21:15 -05:00
Brad King
95b46f1b91 Merge branch 'release-3.20' 2021-02-24 10:58:36 -05:00
Brad King
f456663101 Merge branch 'release-3.19' 2021-02-24 10:58:24 -05:00
Brad King
ee17a15148 Merge branch 'release-3.19' into release-3.20 2021-02-24 10:58:14 -05:00
Brad King
0ecd9de6dd CMake 3.19.6 v3.19.6 2021-02-24 10:08:43 -05:00
Raul Tambre
23753be1cc Clang/CUDA: Restore needed references to implicit link variables 
In commit 4620cf77f2 (Clang: Remove unused CUDA implicit link variables,
2021-02-14) we removed some references.  It turns out they are non-empty
and necessary if using a non-scattered installation.

Fixes: #21863
 2021-02-24 09:58:06 -05:00
Brad King
b4a103bdec Merge topic 'autouic-headers-ninja' 
1265c65b33 AUTOUIC: Collect ui header files for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5803
 2021-02-24 09:49:03 -05:00
Brad King
a70f8770f2 Merge topic 'better_cuda_compiler_detection_error_messages' into release-3.20 
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5844
 2021-02-24 09:47:39 -05:00
Brad King
956aa541c1 Merge branch 'release-3.20' 2021-02-24 09:47:39 -05:00
Brad King
35b448a7dd Merge topic 'better_cuda_compiler_detection_error_messages' 
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5844
 2021-02-24 09:47:39 -05:00
Brad King
31040d477c Merge branch 'release-3.20' 2021-02-24 09:46:53 -05:00
Brad King
e95f7aa0ed Merge topic 'preset-flag-consistency' into release-3.20 
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument
2f13fdef0a cmake: Document '--preset <preset>' form of the argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5849
 2021-02-24 09:46:52 -05:00
Brad King
414cfc6ecb Merge topic 'preset-flag-consistency' 
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument
2f13fdef0a cmake: Document '--preset <preset>' form of the argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5849
 2021-02-24 09:46:52 -05:00
Brad King
1c7b31e59e Merge branch 'release-3.20' 2021-02-24 09:45:51 -05:00
Brad King
d4ce3d65f3 Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' 
b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5841
 2021-02-24 09:45:51 -05:00
Brad King
14c6a88db6 Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' into release-3.20 
b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5841
 2021-02-24 09:45:50 -05:00
Brad King
022990c352 Merge branch 'release-3.20' 2021-02-24 09:44:59 -05:00
Brad King
261ba00668 Merge topic 'autogen-cmp0116-fix' into release-3.20 
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
 2021-02-24 09:44:59 -05:00
Brad King
ab3485d15b Merge topic 'autogen-cmp0116-fix' 
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
 2021-02-24 09:44:59 -05:00
Brad King
16a2c0cfa3 Merge branch 'release-3.20' 2021-02-24 09:42:49 -05:00
Brad King
09419af7af Merge branch 'release-3.19' 2021-02-24 09:42:46 -05:00
Brad King
9569b3f437 Merge branch 'release-3.19' into release-3.20 2021-02-24 09:42:39 -05:00
Brad King
0090df66d4 Merge branch 'release-3.20' 2021-02-24 09:42:00 -05:00
Brad King
75d7329adb Merge topic 'preset-no-comments' into release-3.20 
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
431dd59b5e CMakePresets.json: Remove undocumented support for comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5853
 2021-02-24 09:42:00 -05:00
Brad King
bf0fd71ad1 Merge topic 'preset-no-comments' 
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
431dd59b5e CMakePresets.json: Remove undocumented support for comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5853
 2021-02-24 09:42:00 -05:00
Brad King
cf21ea2ce6 Merge topic 'ninja-status-stderr' into release-3.20 
d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5850
 2021-02-24 09:41:03 -05:00
Brad King
4b27a80cbc Merge branch 'release-3.20' 2021-02-24 09:41:03 -05:00
Brad King
46607d561a Merge topic 'ninja-status-stderr' 
d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5850
 2021-02-24 09:41:03 -05:00
Brad King
fcf0c66b5a Merge branch 'backport-3.19-preset-no-comments' into release-3.19 
Merge-request: !5853
 2021-02-24 09:39:20 -05:00
Brad King
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments 2021-02-24 09:33:59 -05:00
Kyle Edwards
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 2021-02-24 09:33:50 -05:00
Kyle Edwards
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 
Revert commit 8f1e607ed9 (Help: Document JSON comment support in
cmake-presets(7), 2021-02-18).  The support for comments was a mistake
when the feature was implemented in 3.19, and is being removed.
 2021-02-24 09:33:50 -05:00