mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 12:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,441 Commits 2 Branches 391 Tags
cc47f4ebf98c42ca442f38344fad16f1679eee9e
Commit Graph

51441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
cc47f4ebf9 Merge topic 'fileapi-toolchains' 
6418dabb87 Tests: Add test for toolchains-v1 File API object
1c5bd1bed5 Tests: Add toolchains kind to capabilities test
f72bb2ee0d Help: Add documentation for "toolchains" object kind
bb069c0857 cmFileAPI: Add "toolchains" object kind.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5678
 2021-01-14 13:02:54 -05:00
Brad King
224956255d Merge topic 'fuzz1' 
b0107165b7 Tests: Add a fuzzer for oss-fuzz

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5668
 2021-01-14 13:01:22 -05:00
Brad King
967d1f7dde Merge topic 'install-FILES-rename-genex' 
ac3ccc393e install(files): Support genex in rename option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5694
 2021-01-14 13:00:16 -05:00
Kitware Robot
7bdef757ab CMake Nightly Date Stamp 2021-01-14 00:01:11 -05:00
Brad King
438ed46c13 Merge topic 'ExternalProject-configure-handled-by-build' 
7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5626
 2021-01-13 09:21:47 -05:00
Brad King
27c2579efd Merge topic 'issue-21663' 
38e2299fc8 list(REMOVE_ITEM): Make removal of an empty item a no-op.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5693
 2021-01-13 09:21:00 -05:00
Brad King
00d8a1dff8 Merge topic 'depend_make_refine' 
4d509437cb cmDepends: disable long line dependencies for nmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5689
 2021-01-13 09:20:13 -05:00
Brad King
82a3b6f89a Merge topic 'detect_corresponding_binutils_version' 
b12aec6c8d BinUtils: prefer bin utils matching the compiler version extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5606
 2021-01-13 09:19:30 -05:00
Brad King
48b072e73d Merge branch 'release-3.19' 2021-01-13 08:57:41 -05:00
Brad King
19ff734e76 CMake 3.19.3 v3.19.3 2021-01-13 07:58:18 -05:00
Craig Scott
4274b4aaaf Merge topic 'doc-standard-module-var-names' 
cc32eeae17 Help: Clarify standard module variable naming

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5679
 2021-01-13 06:31:01 -05:00
AdamKorcz
b0107165b7 Tests: Add a fuzzer for oss-fuzz 2021-01-13 11:04:59 +00:00
Asit Dhal
ac3ccc393e install(files): Support genex in rename option 
Fixes: #19903
 2021-01-13 11:27:56 +01:00
Kitware Robot
3ad1ee8144 CMake Nightly Date Stamp 2021-01-13 00:01:14 -05:00
Ben McMorran
6418dabb87 Tests: Add test for toolchains-v1 File API object 2021-01-12 15:43:38 -08:00
Ben McMorran
1c5bd1bed5 Tests: Add toolchains kind to capabilities test 2021-01-12 14:25:39 -08:00
Ben McMorran
f72bb2ee0d Help: Add documentation for "toolchains" object kind 2021-01-12 11:21:28 -08:00
Ben McMorran
bb069c0857 cmFileAPI: Add "toolchains" object kind. 
Fixes #19514
 2021-01-12 11:21:19 -08:00
Brad King
20a7d4485c Merge topic 'FindHDF5docfix' 
eec3b775a7 FindHDF5: List imported targets in debug output
186b0f8131 FindHDF5: correct and describe list of imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5684
 2021-01-12 10:31:52 -05:00
Brad King
cc27ab0b27 Merge topic 'FindJPEG-turbo' 
74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5683
 2021-01-12 10:30:27 -05:00
Brad King
d591353126 Merge topic 'cuda_architectures_default_doc' 
baa530fe9f Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5685
 2021-01-12 10:29:43 -05:00
Brad King
bd0700d107 Merge topic 'sections-to-if-documentation' 
55ba98556f Help: Add sections to if() conditions documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5677
 2021-01-12 10:28:49 -05:00
Brad King
d87a8934e0 Merge topic 'cuda-nvcc-ccache-symlink' 
fb2afef620 CUDA: Support nvcc symlinking to ccache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5620
 2021-01-12 10:27:19 -05:00
Brad King
db8e2e711a Merge topic 'ninja-multi-config-post-build' 
98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5673
 2021-01-12 10:25:07 -05:00
Brad King
4304767ae4 Merge topic 'trace_expand_bracket' into release-3.19 
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5687
 2021-01-12 10:20:26 -05:00
Brad King
462dc20efa Merge branch 'release-3.19' 2021-01-12 10:20:26 -05:00
Brad King
b7485c98a0 Merge topic 'trace_expand_bracket' 
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5687
 2021-01-12 10:20:26 -05:00
Brad King
6fc33ab446 Merge branch 'release-3.19' 2021-01-12 10:19:29 -05:00
Brad King
97a713cf25 Merge topic 'cmake-gui-qrc-fix' 
9f48a468cd Merge branch 'master' into cmake-gui-qrc-fix
e20560a2dc cmake-gui: Restore linking of Qt resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5691
 2021-01-12 10:19:29 -05:00
Brad King
c3c63801f8 Merge topic 'cmake-gui-qrc-fix' into release-3.19 
e20560a2dc cmake-gui: Restore linking of Qt resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5691
 2021-01-12 10:19:28 -05:00
Anakin Skywalker
cc32eeae17 Help: Clarify standard module variable naming 
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2021-01-12 23:00:34 +11:00
Daan De Meyer
7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option 
Fixes #21592.
 2021-01-12 08:50:02 +01:00
Asit Dhal
38e2299fc8 list(REMOVE_ITEM): Make removal of an empty item a no-op. 
Fixes: #21663
 2021-01-12 08:27:40 +01:00
Kitware Robot
6b50b8d947 CMake Nightly Date Stamp 2021-01-12 00:01:09 -05:00
Kyle Edwards
9f48a468cd Merge branch 'master' into cmake-gui-qrc-fix 2021-01-11 15:00:51 -05:00
Kyle Edwards
e20560a2dc cmake-gui: Restore linking of Qt resources 
Refactoring in commit 41e223deb3 (CMake GUI: Split up into libraries,
add test shim, 2020-09-14, v3.19.0-rc1~116^2~2) broke linking of Qt
resources, such as the Add/Remove Entry button icons.

Fixes: #21682
 2021-01-11 14:57:53 -05:00
Raul Tambre
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand 
Bracket arguments are literal and shouldn't be expanded.

Fixes #21671.
 2021-01-11 19:54:18 +02:00
Kai Wang
4d509437cb cmDepends: disable long line dependencies for nmake 
This is a follow-up to commit b696f78073 (cmDepends: merge dependers of
depend makefile, 2020-12-18).  NMake of visual studio has many versions
that not support long line dependencies of make rule.

Signed-off-by: Wangkai <wangkai86@huawei.com>
Fixes: #21681
 2021-01-11 12:14:04 -05:00
Miguel Medalha
74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too 2021-01-11 12:07:02 -05:00
Kris Thielemans
eec3b775a7 FindHDF5: List imported targets in debug output 
If HDF5_FIND_DEBUG, list all targets that are defined
(from either FindHDF5.cmake or the hdf5-config.cmake).
 2021-01-11 12:00:38 -05:00
Kris Thielemans
186b0f8131 FindHDF5: correct and describe list of imported target 2021-01-11 12:00:14 -05:00
Thomas Bernard
b12aec6c8d BinUtils: prefer bin utils matching the compiler version extension 2021-01-11 11:33:37 -05:00
Brad King
06dfa5a7b6 Merge topic 'makefiles-compiler-deps' 
bb64ea5741 Makefiles: ensure transparent switch between dependencies strategies
8ec7408d74 Makefile dependencies: ensure long paths are used on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5655
 2021-01-11 11:28:58 -05:00
Brad King
0b32dfb292 Merge topic 'FindPostgreSQL-server-not-required' 
f254e67bf6 FindPostgreSQL: Do not require pg_type.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5656
 2021-01-11 11:27:04 -05:00
Rong Ou
fb2afef620 CUDA: Support nvcc symlinking to ccache 
Invoke `nvcc -v` to find the real CUDA bin directory.
This is needed if `nvcc` is a symlink to `ccache` or `colornvcc`.

Fixes: #21177
 2021-01-11 00:18:04 -08:00
Kitware Robot
1fb0670f4b CMake Nightly Date Stamp 2021-01-11 00:01:15 -05:00
Raul Tambre
baa530fe9f Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES value 
Fixes #21302 and #21666.
 2021-01-10 12:06:02 +02:00
Kitware Robot
aaebbd200b CMake Nightly Date Stamp 2021-01-10 00:03:09 -05:00
Marc Chevrier
bb64ea5741 Makefiles: ensure transparent switch between dependencies strategies 2021-01-09 11:35:17 +01:00
Marc Chevrier
8ec7408d74 Makefile dependencies: ensure long paths are used on Windows 2021-01-09 11:35:00 +01:00