summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
* | \ \ \ \ \ Merge branch 'release-3.18'Brad King2020-06-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'FindOpenSSL-3.0' into release-3.18Brad King2020-06-091-2/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4860
* | | | | | | Merge topic 'FindOpenSSL-3.0'Brad King2020-06-091-2/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4860
| * | | | | | FindOpenSSL: Fix OpenSSL 3.0.0 version extractionBilly Brumley2020-06-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the regex syntax added by commit 61d746e592 (FindOpenSSL: Detect OpenSSL 3.0.0, 2020-05-27, v3.17.3~1^2). Add missing escapes. Test with `openssl-3.0.0-alpha3`. While at it, also unset a temporary variable after use.
* | | | | | | Merge branch 'release-3.18'Craig Scott2020-06-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-gitlab-ci' into release-3.18Craig Scott2020-06-091-34/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 855ed80111 Help/dev: Update CMake Review Process document for GitLab CI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4865
* | \ \ \ \ \ \ Merge topic 'doc-gitlab-ci'Craig Scott2020-06-091-34/+31
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 855ed80111 Help/dev: Update CMake Review Process document for GitLab CI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4865
| * | | | | | | Help/dev: Update CMake Review Process document for GitLab CIBrad King2020-06-091-34/+31
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | We have replaced use of `buildbot` with GitLab CI. Update the relevant section of our review process documentation.
* | | | | | | Merge branch 'release-3.18'Craig Scott2020-06-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-testprop-DEPENDS-REQUIRED_FILES' into release-3.18Craig Scott2020-06-092-1/+44
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b75175219 Help: Add example for REQUIRED_FILES test property 61139c91d2 Help: Add example for DEPENDS test property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4853
* | \ \ \ \ \ \ Merge topic 'doc-testprop-DEPENDS-REQUIRED_FILES'Craig Scott2020-06-092-1/+44
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b75175219 Help: Add example for REQUIRED_FILES test property 61139c91d2 Help: Add example for DEPENDS test property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4853
| * | | | | | | Help: Add example for REQUIRED_FILES test propertyMichael Hirsch2020-06-081-1/+32
| | | | | | | |
| * | | | | | | Help: Add example for DEPENDS test propertyMichael Hirsch2020-06-081-0/+12
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-06-091-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.18'Brad King2020-06-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'remove-unused-ci-script' into release-3.18Brad King2020-06-081-22/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b2d8f178 ci: remove unused sccache download script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4866
* | | | | | | | Merge topic 'remove-unused-ci-script'Brad King2020-06-081-22/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b2d8f178 ci: remove unused sccache download script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4866
| * | | | | | | ci: remove unused sccache download scriptBen Boeckel2020-06-081-22/+0
| |/ / / / / /
* | | | | | | Merge branch 'release-3.18'Brad King2020-06-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge topic 'cpack_typo' into release-3.18Brad King2020-06-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f859e6f812 CPack/IFW: Fix documentation typo: REQUARED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4862
* | \ \ \ \ \ \ Merge topic 'cpack_typo'Brad King2020-06-081-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f859e6f812 CPack/IFW: Fix documentation typo: REQUARED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4862
| * | | | | | | CPack/IFW: Fix documentation typo: REQUAREDFrederik Gladhorn2020-06-081-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'release-3.18'Brad King2020-06-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge topic 'vs-add_package_reference_install' into release-3.18Brad King2020-06-083-1/+32
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4854
* | \ \ \ \ \ \ Merge topic 'vs-add_package_reference_install'Brad King2020-06-083-1/+32
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4854
| * | | | | | | VS: Enable DOTNET_TARGET_FRAMEWORK properties all target typesKinan Mahdi2020-06-053-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them compatible with `VS_PACKAGE_REFERENCES` and, in particular, fixes nuget package references in combination with install targets. Fixes: #20764
* | | | | | | | Merge branch 'release-3.18'Brad King2020-06-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cuda_cudart_status' into release-3.18Brad King2020-06-081-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e2f86461a FindCUDAToolkit: Fix cudart not found status message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4861
* | \ \ \ \ \ \ \ Merge topic 'cuda_cudart_status'Brad King2020-06-081-4/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e2f86461a FindCUDAToolkit: Fix cudart not found status message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4861
| * | | | | | | | FindCUDAToolkit: Fix cudart not found status messageRaul Tambre2020-06-081-4/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ended up after the searching after commit dc2eae1 (FindCUDAToolkit: Factor out discovery code into a separate file, 2020-04-22). Move it back to where it was and should be.
* | | | | | | | Merge branch 'release-3.18'Brad King2020-06-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cuda_clang_simulate' into release-3.18Brad King2020-06-081-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4863
generated by cgit v0.12 at 2025-09-09 21:49:57 (GMT)