summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* target_link_libraries: self-link through ALIAS is an errorMarc Chevrier2020-05-3012-1/+62
| | | | Fixes: #19617
* CMake Nightly Date StampKitware Robot2020-05-301-1/+1
|
* Merge topic 'gitlab-ci-concurrency-tags'Brad King2020-05-291-0/+4
|\ | | | | | | | | | | | | | | | | 0eebd0a0e3 gitlab-ci: pin macOS and Windows jobs to nonconcurrent runners Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4823
| * gitlab-ci: pin macOS and Windows jobs to nonconcurrent runnersBrad King2020-05-291-0/+4
|/ | | | | | | | | | | | | | On macOS and Windows, our jobs use a `GIT_CLONE_PATH` that does not contain `$CI_CONCURRENCY_ID` so that the build and test jobs always use the same path. Since we use shell runners for these platforms, all concurrent jobs would use the same path and conflict. Therefore we can only use runners with a concurrency level of 1 for jobs in the `build` and `test` stages. However, jobs in the `test-ext` stage configure a new build tree for the tests and therefore can use `$CI_CONCURRENCY_ID` and support shell runners with higher concurrency levels. Prepare to make that distinction in the future by pinning all jobs to runners with a `nonconcurrent` tag.
* Merge topic 'gitlab-ci-xcode-11.5'Brad King2020-05-291-2/+2
|\ | | | | | | | | | | | | | | 0508a80c1a gitlab-ci: update macOS jobs to Xcode 11.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4821
| * gitlab-ci: update macOS jobs to Xcode 11.5Brad King2020-05-291-2/+2
|/
* Merge topic 'gitlab-ci-toolsets'Brad King2020-05-292-2/+7
|\ | | | | | | | | | | | | | | 0d5a1fd6e2 gitlab-ci: pin windows and macos jobs to runners with matching toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4817
| * gitlab-ci: pin windows and macos jobs to runners with matching toolsetsBrad King2020-05-292-2/+7
| | | | | | | | | | | | | | | | The toolsets available on machines hosting shell runners will evolve over time. Require the runners to have tags indicating that they have specific toolsets available. When toolsets are eventually removed from a runner, its tags can then be updated accordingly to prevent pipelines created for old commits from ever running on them.
* | Merge topic 'msbuild-utf8-disable'Brad King2020-05-291-2/+5
|\ \ | |/ |/| | | | | | | | | 5058fb5401 VS: Drop StdOutEncoding with VS 16.6 pending investigation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4820
| * VS: Drop StdOutEncoding with VS 16.6 pending investigationBrad King2020-05-291-2/+5
|/ | | | | | | | | The `StdOutEncoding` added to `.vcxproj` files since commit bc877a7e94 (Add support to indicate UTF-8 custom command pipe output encoding, 2020-04-08) breaks custom commands with symbolic outputs on VS 16.6.0. Disable it pending further investigation and possibly a fix in VS. Issue: #20769
* Merge topic 'alias-cannot-overwrite-another-target'Brad King2020-05-2911-1/+100
|\ | | | | | | | | | | | | 1eca5993e2 ALIAS target: cannot overwrite an existing target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4810
| * ALIAS target: cannot overwrite an existing targetMarc Chevrier2020-05-2811-1/+100
| | | | | | | | Fixes: #19616
* | Merge topic 'bugfix-gcev'Brad King2020-05-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | d606b19f7d server-mode: Fix regression in cache entry reporting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4808
| * | server-mode: Fix regression in cache entry reportingVitaly Stakhovsky2020-05-281-1/+1
| | | | | | | | | | | | | | | | | | Refactoring in commit 0bf0e35e59 (cmCacheManager::GetProperty: return cmProp, 2020-03-19) changed the return type of GetCacheEntryValue. Update the server mode's call site accordingly.
* | | Merge branch 'release-3.17'Brad King2020-05-290-0/+0
|\ \ \
| * \ \ Merge topic 'FindSubversion-xcode-removed' into release-3.17Brad King2020-05-291-2/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4813
* | \ \ \ Merge topic 'FindSubversion-xcode-removed'Brad King2020-05-291-2/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4813
| * | | | FindSubversion: Do not accept macOS stub without Xcode implementationBrad King2020-05-281-2/+11
| |/ / / | | | | | | | | | | | | | | | | Xcode no longer provides a `svn` implementation, but the `/usr/bin/svn` stub may still exist.
* | | | CMake Nightly Date StampKitware Robot2020-05-291-1/+1
| |_|/ |/| |
* | | Merge topic 'macos-pin-xcode-versions'Brad King2020-05-284-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35b29d3568 ci: disable java detection 72a7697901 gitlab-ci: pin macOS to a specific Xcode version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4812
| * | | ci: disable java detectionBen Boeckel2020-05-283-2/+11
| | | |
| * | | gitlab-ci: pin macOS to a specific Xcode versionBen Boeckel2020-05-281-0/+3
|/ / /
* | | Merge branch 'release-3.17'Brad King2020-05-280-0/+0
|\ \ \ | |/ /
| * | CMake 3.17.3v3.17.3Brad King2020-05-281-1/+1
| | |
* | | 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
generated by cgit v0.12 at 2025-02-14 21:05:03 (GMT)