mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 17:19:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,597 Commits 2 Branches 401 Tags
02a82e4cd409f0bbdf65397eacf29a2702b99e63
Commit Graph

48597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 82c402ed34 Merge branch 'release-3.18' 2020-06-12 10:05:33 -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 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
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
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
Robert Maynard 644d3b86eb C: Compile when possible with explicit C language flag set 
Issue: #14516, #20716
 2020-06-09 16:20:53 -04:00
Brad King c08ee5e74e Merge branch 'release-3.18' 2020-06-09 12:30:14 -04:00
Ben Boeckel 131b8cc8ae Help/dev: document other arguments to Do: test 2020-06-09 11:12:05 -04:00
Brad King 596cfd2680 CMake 3.18.0-rc1 v3.18.0-rc1 2020-06-09 10:58:51 -04:00
Rolf Eike Beer 42dcc2bd51 CTestConfig: allow nightly build submission using https 
The idea is that one may set `CTEST_DROP_METHOD` in custom CTest
scripting.
 2020-06-09 09:33:01 -04:00
Brad King 90954f770a Merge branch 'release-3.18' 2020-06-09 09:25:54 -04:00
Brad King 9ceb980981 Merge topic 'cmGeneratorTarget-include-cmProperty' into release-3.18 
e65e88fbce cmGeneratorTarget: fix misplaced header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4864
 2020-06-09 09:25:54 -04:00
Brad King 7d2e4730b7 Merge topic 'cmGeneratorTarget-include-cmProperty' 
e65e88fbce cmGeneratorTarget: fix misplaced header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4864
 2020-06-09 09:25:54 -04:00
Brad King 4d9c42ff6d Merge topic 'cpack-extern-update-package-list' 
a6e1b20bab CPack External: Introduce `CPACK_EXTERNAL_BUILT_PACKAGES`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4831
 2020-06-09 09:25:19 -04:00
Brad King 293d89ce09 Merge topic 'android-windows-multi-config' 
d3d98288e2 Tests: Ensure that Android tests work for multi-config generators
be9633bc6e Tests: Append .exe suffix to objdump in Android test on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4858
 2020-06-09 09:23:50 -04:00
Brad King 577c86e59d Merge topic 'cpack-ifw-3.2' into release-3.18 
b79aad8069 CPack/IFW: Add Qt installer framework version 3.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4859
 2020-06-09 09:23:08 -04:00
Brad King 7c8c28b5ca Merge branch 'release-3.18' 2020-06-09 09:23:08 -04:00
Brad King 3803f933bf Merge topic 'cpack-ifw-3.2' 
b79aad8069 CPack/IFW: Add Qt installer framework version 3.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4859
 2020-06-09 09:23:08 -04:00
Brad King 834cabeed6 Merge branch 'release-3.17' 2020-06-09 08:53:31 -04:00
Brad King 21483d9ea6 Merge branch 'release-3.18' 2020-06-09 08:53:06 -04:00
Brad King cc1592d708 Merge topic 'FindOpenSSL-3.0' 
796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4860
 2020-06-09 08:53:06 -04:00