summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-lang-C'Brad King2020-06-124-4/+10
|\ | | | | | | | | | | | | 5c04e77e07 VS: Restore compilation of '.C' sources as C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4880
| * VS: Restore compilation of '.C' sources as C++Brad King2020-06-114-4/+10
| | | | | | | | | | | | | | | | | | Refactoring in commit 3b547e2e4b (VS: Simplify logic adding source file C/C++ language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) failed to account for MSVC's treatment of `.C` extensions as C. Add this special case to the logic to restore use of `-TP` for `.C` extensions. Fixes: #20822
* | Merge branch 'release-3.18'Brad King2020-06-120-0/+0
|\ \
| * \ Merge topic 'gitlab-ci-more-qtdialog' into release-3.18Brad King2020-06-127-3/+184
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions 973fc56020 gitlab-ci: test QtDialog on macOS 1a995439e5 ci: add download information for Qt on macOS 881c0b86dd gitlab-ci: test QtDialog on Windows b8d46d5e50 ci: add a script to download Qt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4874
* | | Merge topic 'gitlab-ci-more-qtdialog'Brad King2020-06-127-3/+184
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions 973fc56020 gitlab-ci: test QtDialog on macOS 1a995439e5 ci: add download information for Qt on macOS 881c0b86dd gitlab-ci: test QtDialog on Windows b8d46d5e50 ci: add a script to download Qt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4874
| * | QCMakeCacheView: use non-deprecated List and Set constructionsBen Boeckel2020-06-101-2/+15
| | |
| * | gitlab-ci: test QtDialog on macOSBen Boeckel2020-06-102-0/+5
| | |
| * | ci: add download information for Qt on macOSBen Boeckel2020-06-102-0/+12
| | |
| * | gitlab-ci: test QtDialog on WindowsBen Boeckel2020-06-103-1/+7
| | |
| * | ci: add a script to download QtBen Boeckel2020-06-102-0/+145
| | |
* | | Merge topic 'https-submit'Brad King2020-06-122-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 42dcc2bd51 CTestConfig: allow nightly build submission using https Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4868
| * | | CTestConfig: allow nightly build submission using httpsRolf Eike Beer2020-06-092-2/+6
| | | | | | | | | | | | | | | | | | | | The idea is that one may set `CTEST_DROP_METHOD` in custom CTest scripting.
* | | | CMake Nightly Date StampKitware Robot2020-06-121-1/+1
| | | |
* | | | Merge topic 'add_explicit_lang_flag_to_compile_object_rule'Brad King2020-06-1119-5/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74b1c9fc8e Explicitly specify language flag when source LANGUAGE property is set 457170a476 CXX: Compile when possible with explicit `Cxx` language flag set 644d3b86eb C: Compile when possible with explicit `C` language flag set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4780
| * | | | Explicitly specify language flag when source LANGUAGE property is setRobert Maynard2020-06-097-2/+59
| | | | | | | | | | | | | | | | | | | | Fixes: #14516, #20716
| * | | | CXX: Compile when possible with explicit `Cxx` language flag setRobert Maynard2020-06-096-3/+12
| | | | | | | | | | | | | | | | | | | | Issue: #14516, #20716
| * | | | C: Compile when possible with explicit `C` language flag setRobert Maynard2020-06-096-0/+12
| | | | | | | | | | | | | | | | | | | | Issue: #14516, #20716
* | | | | Merge topic 'cmake-E-compare_files-stderr'Brad King2020-06-113-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7d44d55ae cmake: remove -E compare_files error message if files differ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Axel Heider <axelheider@gmx.de> Merge-request: !4867
| * | | | | cmake: remove -E compare_files error message if files differAsit Dhal2020-06-103-4/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | It is not an error for the files to be different. Fixes: #20803
* | | | | Merge branch 'release-3.18'Brad King2020-06-110-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'nvcc_supports_cuda17' into release-3.18Brad King2020-06-111-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4872
* | \ \ \ \ Merge topic 'nvcc_supports_cuda17'Brad King2020-06-111-0/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4872
| * | | | | CUDA: Teach CMake that NVCC 11 supports cuda_std_17Robert Maynard2020-06-101-0/+11
| | |_|_|/ | |/| | |
* | | | | Merge branch 'release-3.18'Brad King2020-06-110-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'FindProtobuf-typo' into release-3.18Brad King2020-06-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1de3d1b34 FindProtobuf: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4873
* | \ \ \ \ Merge topic 'FindProtobuf-typo'Brad King2020-06-111-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c1de3d1b34 FindProtobuf: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4873
| * | | | | FindProtobuf: Fix typo in documentationRon Klein2020-06-101-1/+1
| | |/ / / | |/| | | | | | | | | | | | | typo: "filess" ==> "files"
* | | | | CMake Nightly Date StampKitware Robot2020-06-111-1/+1
| | | | |
* | | | | Merge branch 'release-3.18'Craig Scott2020-06-100-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'add-missing-test-args' into release-3.18Craig Scott2020-06-101-0/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 131b8cc8ae Help/dev: document other arguments to `Do: test` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4870
* | | | | Merge topic 'add-missing-test-args'Craig Scott2020-06-101-0/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 131b8cc8ae Help/dev: document other arguments to `Do: test` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4870
| * | | | Help/dev: document other arguments to `Do: test`Ben Boeckel2020-06-091-0/+13
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-06-101-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release-3.18'Brad King2020-06-090-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.18.0-rc1v3.18.0-rc1Brad King2020-06-091-1/+1
| | | |
* | | | Merge branch 'release-3.18'Brad King2020-06-090-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'cmGeneratorTarget-include-cmProperty' into release-3.18Brad King2020-06-091-2/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e65e88fbce cmGeneratorTarget: fix misplaced header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4864
* | \ \ \ Merge topic 'cmGeneratorTarget-include-cmProperty'Brad King2020-06-091-2/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | e65e88fbce cmGeneratorTarget: fix misplaced header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4864
| * | | | cmGeneratorTarget: fix misplaced headerVitaly Stakhovsky2020-06-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b36d1bdd9d (Single location for cmProp typedef, 2020-05-30) we accidentally left inclusion of `cmProperty.h` out of the main block of includes.
* | | | | Merge topic 'cpack-extern-update-package-list'Brad King2020-06-096-0/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6e1b20bab CPack External: Introduce `CPACK_EXTERNAL_BUILT_PACKAGES` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4831
| * | | | | CPack External: Introduce `CPACK_EXTERNAL_BUILT_PACKAGES`Alex Turbov2020-06-056-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CPACK_EXTERNAL_PACKAGE_SCRIPT` script may set this list variable to the full paths of generated package files. CPack copy these files from the stage directory back to the top build directory and possibly produce checksum files if the `CPACK_PACKAGE_CHECKSUM` is set.
* | | | | | Merge topic 'android-windows-multi-config'Brad King2020-06-092-5/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3d98288e2 Tests: Ensure that Android tests work for multi-config generators be9633bc6e Tests: Append .exe suffix to objdump in Android test on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4858
| * | | | | | Tests: Ensure that Android tests work for multi-config generatorsKyle Edwards2020-06-051-4/+27
| | | | | | |
| * | | | | | Tests: Append .exe suffix to objdump in Android test on WindowsKyle Edwards2020-06-051-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.18'Brad King2020-06-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'cpack-ifw-3.2' into release-3.18Brad King2020-06-091-0/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b79aad8069 CPack/IFW: Add Qt installer framework version 3.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4859
* | | | | | | Merge topic 'cpack-ifw-3.2'Brad King2020-06-091-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b79aad8069 CPack/IFW: Add Qt installer framework version 3.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4859
| * | | | | | CPack/IFW: Add Qt installer framework version 3.2Frederik Gladhorn2020-06-081-0/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Qt 5.15 comes with IFW 3.2
* | | | | | Merge branch 'release-3.17'Brad King2020-06-090-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindOpenSSL-3.0' into release-3.17Brad King2020-06-081-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4860