summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
| * | | | | | | tests: avoid a warning for ctresallocBen Boeckel2020-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing an installed CMake, this executable does not exist. Also remove the "or build" because we are expecting it to be built if the target exists (and is a build failure if it fails there).
| * | | | | | | gitlab-ci: get the VS2019 location from the runnerBen Boeckel2020-05-261-1/+1
| | | | | | | |
| * | | | | | | gitlab-ci: get sccache location from the runner on WindowsBen Boeckel2020-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the sccache executable is in the build directory, it can fail to be removed if the daemon is still running when another job starts. It continues to run when a job is canceled or fails and then is "in use" and cannot be deleted.
| * | | | | | | gitlab-ci: delay manual jobs on merges for 5 minutesBen Boeckel2020-05-261-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should avoid races with merge trains canceling in-progress builds leaving "rubble" around for further builds to trip over.
* | | | | | | Merge topic 'reduce-initial-checks'Brad King2020-05-267-259/+266
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d21dd0f7c enable_language: Assume compiler works if ABI detection compiles 7a01250581 CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4789
| * | | | | | enable_language: Assume compiler works if ABI detection compilesBrad King2020-05-256-258/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run a `try_compile` with a tiny test source to check if the compiler works so that we can fail early if it does not. When the compiler does work, we immediately `try_compile` the ABI detection source. In the common case that both steps work, we gain no useful information from the first one and the work was wasted. Re-order the checks to try the ABI detection first. If it works then assume the compiler works and skip the dedicated check. If the ABI check fails then proceed with the normal test for a working compiler so the diagnostic can be shown as before. Fixes: #18703
| * | | | | | CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILEDBrad King2020-05-251-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'liblzma-reduce-checks'Brad King2020-05-262-204/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8359713e5 liblzma: Assume 'string.h' exists 12e7bfcbf4 liblzma: Use KWIML to get fixed-size integer types 3cd5ed7cb1 liblzma: Drop unused code providing uintmax_t and intmax_t Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4790
| * | | | | | liblzma: Assume 'string.h' existsBrad King2020-05-251-1/+1
| | | | | | |
| * | | | | | liblzma: Use KWIML to get fixed-size integer typesBrad King2020-05-252-187/+25
| | | | | | |
| * | | | | | liblzma: Drop unused code providing uintmax_t and intmax_tBrad King2020-05-252-16/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | The lzma library code we use within CMake does not need these.
* | | | | | Merge topic 'cuda-clang-pthreads'Brad King2020-05-262-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80d37167fe Find{Threads,MPI}: Add support for CUDA with Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !4781
| * | | | | | Find{Threads,MPI}: Add support for CUDA with ClangTobias Ribizel2020-05-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CMake passes `-Xcompiler -pthread` flags to CUDA compilers irrespective of the actual CUDA compiler ID. This makes sure the additional `-Xcompiler` flag is only used with nvcc.
generated by cgit v0.12 at 2024-09-27 19:19:43 (GMT)