summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2020-05-2825-3005/+75
|\ | | | | | | | | | | | | | | 9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys c47501bcca KWSys 2020-05-27 (a3263389) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4804
| * Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-05-2725-3005/+75
| |\ | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-05-27 (a3263389)
| | * KWSys 2020-05-27 (a3263389)KWSys Upstream2020-05-2725-3005/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit a3263389bcaab27fd62a23599d4ce9bdaa01479a (master). Upstream Shortlog ----------------- Brad King (7): ce4941c9 IOStream: Drop this component of KWSys 49d04c2c hashtable: Drop this component of KWSys a0bd892c SystemInformation: Use 'long long' unconditionally 441dd494 Drop unused checks for 'long long' and '__int64' 2b749749 Drop unused C type macros check 74daf33b Drop unused Borland and OpenWatcom preprocessor conditions c4e8126a Drop unused CXX cstdio check
* | | Merge topic 'multi-ninja-pch-object-library'Brad King2020-05-282-95/+150
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f791eb160 Multi-Ninja: Fix reusable PCHs for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexej Harm <alexej.h@xiphos.de> Merge-request: !4787
| * | | Multi-Ninja: Fix reusable PCHs for MSVCCristian Adam2020-05-272-95/+150
| | | | | | | | | | | | | | | | Fixes: #20721
* | | | Merge topic 'reduce-try_compile'Brad King2020-05-282-0/+303
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc681fc372 Hard-code some try_compile results for third-party libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4802
| * | | | Hard-code some try_compile results for third-party librariesBrad King2020-05-272-0/+303
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our bundled third-party libraries perform many `try_compile` checks for compatibility with their upstream build systems. For many of the checks we already know the result for compilers we support for building CMake itself, especially on Windows. Hard-code known results to avoid running the checks.
* | | | Merge branch 'release-3.17'Brad King2020-05-280-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'openssl-3.0.0' into release-3.17Brad King2020-05-281-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4805
* | \ \ \ \ Merge topic 'openssl-3.0.0'Brad King2020-05-281-0/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4805
| * | | | | FindOpenSSL: Detect OpenSSL 3.0.0Vitezslav Cizek2020-05-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenSSL versioning is changing with the upcoming 3.0.0 release. https://www.openssl.org/blog/blog/2018/11/28/version/ Since 3.0.0, the patch letters are being dropped. The new format is: MAJOR.MINOR.PATCH The OPENSSL_VERSION variable can now be directly derived from the new OPENSSL_VERSION_STR macro. https://www.openssl.org/docs/manmaster/man3/OPENSSL_VERSION_NUMBER.html
* | | | | | Merge branch 'release-3.17'Brad King2020-05-280-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'fix-cpack-deb-generating-empty-paragraph' into release-3.17Brad King2020-05-283-12/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ba842163c CPack-deb: don't add a line with a dot to pkg desc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4806
* | \ \ \ \ \ Merge topic 'fix-cpack-deb-generating-empty-paragraph'Brad King2020-05-283-12/+12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ba842163c CPack-deb: don't add a line with a dot to pkg desc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4806
| * | | | | | CPack-deb: don't add a line with a dot to pkg descJonathan Verner2020-05-273-12/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if the package description ends with a newline (typically if it is read from a file) cpack -deb adds a single line with a dot at the end which leads to a violation of the `extended-description-contains-empty-paragraph` debian policy. This commit fixes the above behaviour. Fixes: #20763
* | | | | | CMake Nightly Date StampKitware Robot2020-05-281-1/+1
| | | | | |
* | | | | | Merge topic 'cuda_user_architectures'Brad King2020-05-271-6/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19cc5bc296 CUDA: Throw error if user-specified architectures don't work Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4800
| * | | | | CUDA: Throw error if user-specified architectures don't workRaul Tambre2020-05-261-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if an user specified CMAKE_CUDA_ARCHITECTURES and they didn't work we would end up erroring during compiler testing. Instead check if the architectures we successfully compiled with are the same as the user-specified (if any). If they don't match, then throw a more helpful error than compiler testing would. Additionally, to make this work correctly I made it try all user-specified architectures at once instead of each separately. Implements: #20756
* | | | | | Merge topic 'gitlab-ci-dir'Brad King2020-05-271-5/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc2f964e16 gitlab-ci: Use stable build path on Windows fb20f4f70b gitlab-ci: Use a shorter work directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4807
| * | | | | gitlab-ci: Use stable build path on WindowsBrad King2020-05-271-2/+1
| | | | | |
| * | | | | gitlab-ci: Use a shorter work directoryBrad King2020-05-271-4/+4
|/ / / / /
* | | | | Merge topic 'cuda_lib_x64'Brad King2020-05-271-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2df6f5446 CUDA: Check for lib/x64 library directory in Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4799
| * | | | | CUDA: Check for lib/x64 library directory in Internal/CUDAToolkitRaul Tambre2020-05-261-0/+2
| |/ / / / | | | | | | | | | | | | | | | Fixes #20755.
* | | | | Merge topic 'update-gitlab-links'Brad King2020-05-2724-35/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb705b9531 Update links to gitlab.kitware.com repos to add `-/` Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4795
| * | | | | Update links to gitlab.kitware.com repos to add `-/`Brad King2020-05-2624-35/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | GitLab now uses a `/-/` component between the `group/project` part of the URL and the `{issues,merge_requests,tree}` part so that it can support `group/subgroup/project` with arbitrary depth.
* | | | | Merge topic 'cmState-unused-method'Brad King2020-05-271-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b837ab371 cmState: Drop unused and unimplemented SetCacheValue method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4797
| * | | | | cmState: Drop unused and unimplemented SetCacheValue methodBrad King2020-05-261-1/+0
| |/ / / / | | | | | | | | | | | | | | | Fixes: #20758
* | | | | Merge topic 'automoc-after-generated-sources'Brad King2020-05-272-5/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f2702005a AutoMoc: Configure AutoMoc after generated sources (PCH, Unity) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4792
| * | | | | AutoMoc: Configure AutoMoc after generated sources (PCH, Unity)Cristian Adam2020-05-262-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20119
* | | | | | Merge topic 'test-RunCMake.install-LDFLAGS'Brad King2020-05-271-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c97a3c442 Tests: Fix RunCMake.install LDFLAGS treatment Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4793
| * | | | | | Tests: Fix RunCMake.install LDFLAGS treatmentBrad King2020-05-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d806bd2e8c (Tests: Update test suite to run in an Anaconda environment, 2020-03-30) an extra `}` was left in the value of the modified `LDFLAGS`. Remove it. While at it, simplify the code.
* | | | | | | Merge topic 'cmake_language-check-invalid-commands'Brad King2020-05-279-0/+175
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e483c563 cmake_language: check CALL with control command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4788
| * | | | | | | cmake_language: check CALL with control commandMarc Chevrier2020-05-269-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20739
* | | | | | | | Merge branch 'release-3.17'Brad King2020-05-270-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'ctest-repeat-notrun' into release-3.17Brad King2020-05-276-6/+54
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4801
* | \ \ \ \ \ \ \ Merge topic 'ctest-repeat-notrun'Brad King2020-05-276-6/+54
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4801
| * \ \ \ \ \ \ \ \ Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrunBrad King2020-05-276-6/+54
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | CTest: Make sure NOT_RUN tests show up in the failed test logRobert Maynard2020-05-276-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20543
| | * | | | | | | | Tests: Add coverage of ctest_test RETURN_VALUE and REPEATRobert Maynard2020-05-271-5/+21
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-05-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.16' into release-3.17Brad King2020-05-270-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.16'Brad King2020-05-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | CMake 3.16.7v3.16.7Brad King2020-05-271-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-271-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'test-vs-generator'Brad King2020-05-268-6/+126
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9812e87ee4 gitlab-ci: add a test of the VS generator based off of the ninja build e63fe4a588 ci: add a script to run the tests with an external CMake 9893e159cc ci: support setting the generator platform and toolset e0b9e8fba8 ci: test the configuration that was built f00ab86f1f ci: use BOOL for boolean settings deb5194a32 tests: avoid a warning for ctresalloc f5e6738051 gitlab-ci: get the VS2019 location from the runner 79f3790c1a gitlab-ci: get sccache location from the runner on Windows ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4794
| * | | | | | | | gitlab-ci: add a test of the VS generator based off of the ninja buildBen Boeckel2020-05-263-0/+41
| | | | | | | | |
| * | | | | | | | ci: add a script to run the tests with an external CMakeBen Boeckel2020-05-262-0/+69
| | | | | | | | |
| * | | | | | | | ci: support setting the generator platform and toolsetBen Boeckel2020-05-261-0/+8
| | | | | | | | |
| * | | | | | | | ci: test the configuration that was builtBen Boeckel2020-05-261-0/+1
| | | | | | | | |
| * | | | | | | | ci: use BOOL for boolean settingsBen Boeckel2020-05-261-2/+2
| | | | | | | | |
generated by cgit v0.12 at 2025-08-25 20:06:37 (GMT)