summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fileapi-toolchains'Brad King2021-01-1416-1/+541
|\ | | | | | | | | | | | | | | | | | | 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
| * Tests: Add test for toolchains-v1 File API objectBen McMorran2021-01-1210-54/+195
| |
| * Tests: Add toolchains kind to capabilities testBen McMorran2021-01-121-1/+1
| |
| * Help: Add documentation for "toolchains" object kindBen McMorran2021-01-121-0/+166
| |
| * cmFileAPI: Add "toolchains" object kind.Ben McMorran2021-01-125-0/+233
| | | | | | | | Fixes #19514
* | Merge topic 'fuzz1'Brad King2021-01-142-0/+35
|\ \ | | | | | | | | | | | | | | | | | | b0107165b7 Tests: Add a fuzzer for oss-fuzz Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5668
| * | Tests: Add a fuzzer for oss-fuzzAdamKorcz2021-01-132-0/+35
| | |
* | | Merge topic 'install-FILES-rename-genex'Brad King2021-01-1410-2/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ac3ccc393e install(files): Support genex in rename option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5694
| * | | install(files): Support genex in rename optionAsit Dhal2021-01-1310-2/+44
| | | | | | | | | | | | | | | | Fixes: #19903
* | | | CMake Nightly Date StampKitware Robot2021-01-141-1/+1
| | | |
* | | | Merge topic 'ExternalProject-configure-handled-by-build'Brad King2021-01-135-12/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5626
| * | | | ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD optionDaan De Meyer2021-01-125-12/+129
| | | | | | | | | | | | | | | | | | | | Fixes #21592.
* | | | | Merge topic 'issue-21663'Brad King2021-01-134-5/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38e2299fc8 list(REMOVE_ITEM): Make removal of an empty item a no-op. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5693
| * | | | | list(REMOVE_ITEM): Make removal of an empty item a no-op.Asit Dhal2021-01-124-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21663
* | | | | | Merge topic 'depend_make_refine'Brad King2021-01-132-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d509437cb cmDepends: disable long line dependencies for nmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5689
| * | | | | | cmDepends: disable long line dependencies for nmakeKai Wang2021-01-112-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'detect_corresponding_binutils_version'Brad King2021-01-134-51/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b12aec6c8d BinUtils: prefer bin utils matching the compiler version extension Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5606
| * | | | | | | BinUtils: prefer bin utils matching the compiler version extensionThomas Bernard2021-01-114-51/+61
| | | | | | | |
* | | | | | | | Merge branch 'release-3.19'Brad King2021-01-130-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | CMake 3.19.3v3.19.3Brad King2021-01-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'doc-standard-module-var-names'Craig Scott2021-01-131-43/+93
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc32eeae17 Help: Clarify standard module variable naming Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5679
| * | | | | | | | | Help: Clarify standard module variable namingAnakin Skywalker2021-01-121-43/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | | | | | | | | CMake Nightly Date StampKitware Robot2021-01-131-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge topic 'FindHDF5docfix'Brad King2021-01-121-9/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindHDF5: List imported targets in debug outputKris Thielemans2021-01-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If HDF5_FIND_DEBUG, list all targets that are defined (from either FindHDF5.cmake or the hdf5-config.cmake).
| * | | | | | | | | FindHDF5: correct and describe list of imported targetKris Thielemans2021-01-111-9/+16
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'FindJPEG-turbo'Brad King2021-01-121-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5683
| * | | | | | | | | FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' tooMiguel Medalha2021-01-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cuda_architectures_default_doc'Brad King2021-01-121-0/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baa530fe9f Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5685
| * | | | | | | | | | Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES valueRaul Tambre2021-01-101-0/+15
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21302 and #21666.
* | | | | | | | | | Merge topic 'sections-to-if-documentation'Brad King2021-01-121-19/+35
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55ba98556f Help: Add sections to if() conditions documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5677
| * | | | | | | | | | Help: Add sections to if() conditions documentationShannon Booth2021-01-081-19/+35
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'cuda-nvcc-ccache-symlink'Brad King2021-01-124-3/+50
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | CUDA: Support nvcc symlinking to ccacheRong Ou2021-01-114-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invoke `nvcc -v` to find the real CUDA bin directory. This is needed if `nvcc` is a symlink to `ccache` or `colornvcc`. Fixes: #21177
* | | | | | | | | | | Merge topic 'ninja-multi-config-post-build'Brad King2021-01-128-15/+69
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5673
| * | | | | | | | | | | Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlapKyle Edwards2021-01-078-15/+69
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21252
* | | | | | | | | | | Merge branch 'release-3.19'Brad King2021-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'trace_expand_bracket' into release-3.19Brad King2021-01-122-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5687
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'trace_expand_bracket'Brad King2021-01-122-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5687
| * | | | | | | | | | | cmMakefile: Don't expand bracket arguments in --trace-expandRaul Tambre2021-01-112-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bracket arguments are literal and shouldn't be expanded. Fixes #21671.
* | | | | | | | | | | | Merge branch 'release-3.19'Brad King2021-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'cmake-gui-qrc-fix' into release-3.19Brad King2021-01-121-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e20560a2dc cmake-gui: Restore linking of Qt resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5691
* | | | | | | | | | | | Merge topic 'cmake-gui-qrc-fix'Brad King2021-01-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cmake-gui-qrc-fixKyle Edwards2021-01-111749-18586/+33647
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | / / / | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | cmake-gui: Restore linking of Qt resourcesKyle Edwards2021-01-111-2/+3
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2021-01-121-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'makefiles-compiler-deps'Brad King2021-01-116-48/+83
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Makefiles: ensure transparent switch between dependencies strategiesMarc Chevrier2021-01-091-24/+39
| | | | | | | | | | |
| * | | | | | | | | | Makefile dependencies: ensure long paths are used on WindowsMarc Chevrier2021-01-095-24/+44
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'FindPostgreSQL-server-not-required'Brad King2021-01-111-4/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f254e67bf6 FindPostgreSQL: Do not require pg_type.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5656