Commit Graph

48618 Commits

Author SHA1 Message Date
Brad King d18e715fea Merge topic 'gitlab-ci-xcode-testing'
0f4777ab81 ci: don't test BundleGeneratorTest
77b44ed4ba gitlab-ci: add an Xcode tester
d33b38d4aa gitlab-ci: rename some scripts to be Linux-specific

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4883
2020-06-12 12:26:28 -04:00
Ben Boeckel 0f4777ab81 ci: don't test BundleGeneratorTest
This test uses shared global resources and doesn't work well with the CI
infrastructure we have. It is tested by nightly builders however.
2020-06-12 11:23:36 -04:00
Ben Boeckel 77b44ed4ba gitlab-ci: add an Xcode tester 2020-06-12 11:23:36 -04:00
Ben Boeckel d33b38d4aa gitlab-ci: rename some scripts to be Linux-specific
macOS install trees have a different layout and package names.
2020-06-12 11:23:19 -04:00
Brad King 06c92ea919 Merge branch 'release-3.18' 2020-06-12 11:02:36 -04:00
Brad King 30444546ed Merge topic 'gitlab-ci-ext-test-sets'
2e7cefec03 gitlab-ci: add a cuda10.2 builder
1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA
2caa7502d5 ci: support running just a set of tests with external builders
26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4877
2020-06-12 11:02:36 -04:00
Brad King 3145264449 Merge topic 'gitlab-ci-ext-test-sets' into release-3.18
2e7cefec03 gitlab-ci: add a cuda10.2 builder
1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA
2caa7502d5 ci: support running just a set of tests with external builders
26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4877
2020-06-12 11:02:35 -04:00
Brad King 068551cfb2 Merge topic 'cmake-gui-qt5-only'
4037beb747 QtDialog: remove Qt4 definition
ce9dbceb42 QtDialog: remove Qt4-only code
8ea50749da QtDialog: use Qt5's imported targets
4ccc9921be QtDialog: use qt5 functions for special Qt sources
e4d6015460 QtDialog: remove Qt4 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4836
2020-06-12 10:11:54 -04:00
Brad King d55ab3526c Merge topic 'findhdf5-temporary-files'
931492bd6f FindHDF5: use CMakeFiles for temporary files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4879
2020-06-12 10:11:09 -04:00
Brad King 7b487184d8 Merge topic 'FindBoost-zip-libs'
b76b4dea1c FindBoost: Allow Boost::zlib and Boost::bzip2 targets on all platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4876
2020-06-12 10:10:12 -04:00
Brad King 02a82e4cd4 Merge topic 'ccmake-ncurses-init'
19689d34e6 ccmake: Display an error and interrupt execution if ncurses failed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4835
2020-06-12 10:09:11 -04:00
Brad King 81ea5eb637 Merge topic 'vs-lang-C' into release-3.18
5c04e77e07 VS: Restore compilation of '.C' sources as C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4880
2020-06-12 10:06:37 -04:00
Brad King 448a8deb74 Merge branch 'release-3.18' 2020-06-12 10:06:37 -04:00
Brad King 5b6f08f192 Merge topic 'vs-lang-C'
5c04e77e07 VS: Restore compilation of '.C' sources as C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4880
2020-06-12 10:06:37 -04:00
Brad King d42011e3cf Merge topic 'gitlab-ci-more-qtdialog' into release-3.18
d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions
973fc56020 gitlab-ci: test QtDialog on macOS
1a995439e5 ci: add download information for Qt on macOS
881c0b86dd gitlab-ci: test QtDialog on Windows
b8d46d5e50 ci: add a script to download Qt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4874
2020-06-12 10:05:33 -04:00
Brad King 82c402ed34 Merge branch 'release-3.18' 2020-06-12 10:05:33 -04:00
Brad King df65a40da6 Merge topic 'gitlab-ci-more-qtdialog'
d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions
973fc56020 gitlab-ci: test QtDialog on macOS
1a995439e5 ci: add download information for Qt on macOS
881c0b86dd gitlab-ci: test QtDialog on Windows
b8d46d5e50 ci: add a script to download Qt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4874
2020-06-12 10:05:33 -04:00
Ben Boeckel 2e7cefec03 gitlab-ci: add a cuda10.2 builder 2020-06-12 09:13:21 -04:00
Brad King feca7e2adb Merge topic 'https-submit'
42dcc2bd51 CTestConfig: allow nightly build submission using https

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4868
2020-06-12 06:02:29 -04:00
Kitware Robot 3bf6d7894a CMake Nightly Date Stamp 2020-06-12 00:01:14 -04:00
Brad King 5c04e77e07 VS: Restore compilation of '.C' sources as C++
Refactoring in commit 3b547e2e4b (VS: Simplify logic adding source file
C/C++ language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) failed to
account for MSVC's treatment of `.C` extensions as C.  Add this special
case to the logic to restore use of `-TP` for `.C` extensions.

Fixes: #20822
2020-06-11 14:15:18 -04:00
Seth R Johnson 931492bd6f FindHDF5: use CMakeFiles for temporary files 2020-06-11 13:47:47 -04:00
Ben Boeckel 1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA 2020-06-11 13:04:33 -04:00
Ben Boeckel 2caa7502d5 ci: support running just a set of tests with external builders 2020-06-11 13:03:38 -04:00
Ben Boeckel 26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package 2020-06-11 13:03:38 -04:00
correa b76b4dea1c FindBoost: Allow Boost::zlib and Boost::bzip2 targets on all platforms
When boost is built with `BZIP2_SOURCE` or `ZLIB_SOURCE` it will
generate boost versions of these libraries.  Since commit cb1a434ce0
(FindBoost: Add check headers for `zlib` and `bzip2`, 2016-07-01,
v3.7.0-rc1~400^2) we look for them only on Windows where they are
commonly provided, but they may be available on every platform.
2020-06-11 07:55:40 -04:00
Brad King 7925279c20 Merge topic 'add_explicit_lang_flag_to_compile_object_rule'
74b1c9fc8e Explicitly specify language flag when source LANGUAGE property is set
457170a476 CXX: Compile when possible with explicit `Cxx` language flag set
644d3b86eb C: Compile when possible with explicit `C` language flag set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4780
2020-06-11 07:47:30 -04:00
Brad King d264270307 Merge topic 'cmake-E-compare_files-stderr'
a7d44d55ae cmake: remove -E compare_files error message if files differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Heider <axelheider@gmx.de>
Merge-request: !4867
2020-06-11 07:46:33 -04:00
Brad King 01fb8d7993 Merge topic 'nvcc_supports_cuda17' into release-3.18
95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4872
2020-06-11 07:45:29 -04:00
Brad King 7791e8d1b6 Merge branch 'release-3.18' 2020-06-11 07:45:29 -04:00
Brad King 1e3bbcd43c Merge topic 'nvcc_supports_cuda17'
95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4872
2020-06-11 07:45:29 -04:00
Brad King 61ad9d92bd Merge topic 'FindProtobuf-typo' into release-3.18
c1de3d1b34 FindProtobuf: Fix typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4873
2020-06-11 07:44:24 -04:00
Brad King 7251cb1487 Merge branch 'release-3.18' 2020-06-11 07:44:24 -04:00
Brad King 440d245779 Merge topic 'FindProtobuf-typo'
c1de3d1b34 FindProtobuf: Fix typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4873
2020-06-11 07:44:24 -04:00
Bartosz Kosiorek 19689d34e6 ccmake: Display an error and interrupt execution if ncurses failed 2020-06-11 07:24:05 -04:00
Kitware Robot f6710373cd CMake Nightly Date Stamp 2020-06-11 00:01:06 -04:00
Ben Boeckel d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions 2020-06-10 16:42:56 -04:00
Ben Boeckel 973fc56020 gitlab-ci: test QtDialog on macOS 2020-06-10 16:42:56 -04:00
Ben Boeckel 1a995439e5 ci: add download information for Qt on macOS 2020-06-10 15:57:16 -04:00
Ben Boeckel 881c0b86dd gitlab-ci: test QtDialog on Windows 2020-06-10 15:57:16 -04:00
Ben Boeckel b8d46d5e50 ci: add a script to download Qt 2020-06-10 15:57:16 -04:00
Ron Klein c1de3d1b34 FindProtobuf: Fix typo in documentation
typo: "filess" ==> "files"
2020-06-10 15:01:37 -04:00
Robert Maynard 95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17 2020-06-10 13:27:51 -04:00
Craig Scott 5591e826c8 Merge branch 'release-3.18' 2020-06-10 08:42:40 -04:00
Craig Scott 4587754705 Merge topic 'add-missing-test-args'
131b8cc8ae Help/dev: document other arguments to `Do: test`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4870
2020-06-10 08:42:40 -04:00
Craig Scott abe36194e8 Merge topic 'add-missing-test-args' into release-3.18
131b8cc8ae Help/dev: document other arguments to `Do: test`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4870
2020-06-10 08:42:39 -04:00
Asit Dhal a7d44d55ae cmake: remove -E compare_files error message if files differ
It is not an error for the files to be different.

Fixes: #20803
2020-06-10 07:23:10 -04:00
Kitware Robot c1b6adaedd CMake Nightly Date Stamp 2020-06-10 00:01:08 -04:00
Robert Maynard 74b1c9fc8e Explicitly specify language flag when source LANGUAGE property is set
Fixes: #14516, #20716
2020-06-09 19:41:20 -04:00
Robert Maynard 457170a476 CXX: Compile when possible with explicit Cxx language flag set
Issue: #14516, #20716
2020-06-09 16:20:53 -04:00