summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | Merge topic 'xerces-cygwin-library-naming'Brad King2020-05-261-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b59c127df2 FindXercesC: Find Cygwin libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4783
| * | | | | | FindXercesC: Find Cygwin librariesRoger Leigh2020-05-231-2/+6
| | | | | | |
* | | | | | | Merge topic 'gitlab-ci-run-when-merged'Brad King2020-05-261-13/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8fb1ffc9c gitlab-ci: use rules to only be manual on a merge request Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4791
| * | | | | | | gitlab-ci: use rules to only be manual on a merge requestBen Boeckel2020-05-261-13/+26
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-261-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'fetchcontent-externalproject-empty-args'Craig Scott2020-05-2511-94/+235
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dca6bd04b FetchContent: Preserve empty string arguments cbf2daeed0 ExternalProject: Preserve empty string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4729
| * | | | | | | FetchContent: Preserve empty string argumentsCraig Scott2020-05-235-21/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20579
| * | | | | | | ExternalProject: Preserve empty string argumentsCraig Scott2020-05-236-73/+168
| | | | | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-05-250-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge topic 'doc-updates' into release-3.17Brad King2020-05-252-7/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4786
* | \ \ \ \ \ \ \ Merge topic 'doc-updates'Brad King2020-05-252-7/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4786
| * | | | | | | Help: clarify add_definitions() and add_compile_definitions() behaviorMarc Chevrier2020-05-242-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20736
* | | | | | | | Merge topic 'gitlab-ci-regular-builders'Brad King2020-05-2522-64/+495
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b566f0b308 gitlab-ci: add windows builder 5b564c371e gitlab-ci: add Windows infrastructure 809f9a9916 gitlab: add powershell scripts for utilities 02c56b71a1 gitlab-ci: add a macos builder a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders 3e1a1ba92d ci: add dependencies for the test suite to the Fedora image d5438f783a ci: add make to the CI image 0ed7e424ab gitlab-ci: use the cmake_build_unix anchor ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4723
| * | | | | | | gitlab-ci: add windows builderBen Boeckel2020-05-222-0/+29
| | | | | | | |
| * | | | | | | gitlab-ci: add Windows infrastructureBen Boeckel2020-05-222-2/+81
| | | | | | | |
| * | | | | | | gitlab: add powershell scripts for utilitiesBen Boeckel2020-05-224-0/+66
| | | | | | | |
| * | | | | | | gitlab-ci: add a macos builderBen Boeckel2020-05-226-34/+164
| | | | | | | |
| * | | | | | | gitlab-ci: add Linux makefiles and ninja buildersBen Boeckel2020-05-226-1/+154
| | | | | | | |