mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,170 Commits 2 Branches 401 Tags
6e10518cbcf810ba6b42bc3f1014c72d75897a85
Commit Graph

50170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards 6e10518cbc Help: Add IDE integration guide 2020-10-06 11:54:12 -04:00
Brad King 8c4c658ab0 Merge topic 'cmake-presets' 
6f8fdc686c .gitignore: Add CMakeUserPresets.json
1d25760198 Help: Add presets documentation and release notes
a4382f72d7 CMake GUI: Add presets functionality
8617479061 CMake: Add presets functionality
06128cf949 Presets: Add cmCMakePresetsFile class
5a36542086 Refactor: Add allowArch parameter to cmake::CreateGlobalGenerator()
3059e6aed7 cmJSONHelpers: Add new Bind() function
8682d1b7b2 CMake GUI Tests: Increase default sleep time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5169
 2020-10-06 10:49:59 -04:00
Brad King a12da6fb5e Merge branch 'release-3.18' into master 2020-10-06 10:41:36 -04:00
Brad King 7f031e1130 Merge topic 'gitlab-ci-fix-fortran-c-test' 
39da646238 gitlab-ci: add FortranC test directory to the artifacts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5336
 2020-10-06 10:22:28 -04:00
Ben Boeckel 39da646238 gitlab-ci: add FortranC test directory to the artifacts 2020-10-06 09:55:40 -04:00
Brad King 3cc3d42aba CMake 3.18.4 v3.18.4 2020-10-06 08:28:17 -04:00
Brad King 990cf3c5d2 Merge topic 'add_checkcompilerflag_tests' 
8ac9719659 CheckCompilerFlag: Add tests to verify module correctness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5328
 2020-10-06 08:18:46 -04:00
Robert Maynard 8ac9719659 CheckCompilerFlag: Add tests to verify module correctness 2020-10-06 07:07:02 -04:00
Brad King 7ef9a91e18 Merge topic 'sphinx-deprecations' 
2254fcb68f Utilities/Sphinx: Avoid using deprecated sphinx APIs
e0f643dddc Utilities/Sphinx: Clarify check for sphinx < 1.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5326
 2020-10-06 06:56:18 -04:00
Brad King e0045916c2 Merge topic 'fix-uninitialized-21166' 
c27553afb2 cmCTestBuildHandler: Avoid uninitialized line-numbers
e4e85c5b2d cmake: Fix uninitialized member in HandleDeleteCacheVariables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5321
 2020-10-06 06:55:31 -04:00
Brad King ad2ac18a23 Merge topic 'ci-find-modules' 
0792fe4759 ci: enable IPO tests on Debian 10 and Fedora 31 builds
c582e51909 ci: enable Fortran submodule tests on Debian 10 and Fedora 31 builds
12b56269d4 ci: enable Qt5 tests on Debian 10 and Fedora 31 builds
02e8befb74 gitlab-ci: add job to run test suite on Debian 10 with ninja
2bb2a283e9 ci: add packages for many find modules to the Debian 10 image
03fb06b8e7 ci: enable many find module tests for the Fedora 31 Makefiles build
b23f36bba6 ci: add packages for many find modules to the Fedora 31 image
20f7d51b7b Tests: Revise FindBLAS test to avoid cblas_ mangling
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5322
 2020-10-06 06:54:29 -04:00
Brad King 971c239c4b Merge topic 'update-expat' 
c1de2227fa Merge branch 'upstream-expat' into update-expat
79d5048a80 expat 2020-10-03 (162e16b0)
b788cb9d55 expat: Update script to get Expat 2.2.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5323
 2020-10-06 06:52:43 -04:00
Brad King 691cff7c01 Merge topic 'boost-1.74.0' 
0d86bb0902 FindBoost: Add 1.74 to known versions
1940e24d58 FindBoost: Prevent warning with boost 1.74

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5319
 2020-10-06 06:49:59 -04:00
Brad King eb9cf7f721 Merge topic 'csharp-source_group-bugfix' into release-3.18 
8d87cfdbf3 VS: Fix regression in C# source links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5314
 2020-10-06 06:47:19 -04:00
Brad King de8e2bf0f7 Merge branch 'release-3.18' 2020-10-06 06:47:19 -04:00
Brad King c814172e84 Merge topic 'csharp-source_group-bugfix' 
8d87cfdbf3 VS: Fix regression in C# source links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5314
 2020-10-06 06:47:19 -04:00
Kitware Robot bac0e0adb6 CMake Nightly Date Stamp 2020-10-06 00:01:15 -04:00
Brad King 2254fcb68f Utilities/Sphinx: Avoid using deprecated sphinx APIs 
Sphinx has deprecated `sphinx.util.pycompat.htmlescape` and
`sphinx.builders.qthelp.QtHelpBuilder`.  We only import these as part of
a monkey-patch to work around a bug in versions of sphinx before 1.7.2,
so make that code path conditional.  The imports are not deprecated on
the versions where we need them.
 2020-10-05 13:38:08 -04:00
Brad King e0f643dddc Utilities/Sphinx: Clarify check for sphinx < 1.4 2020-10-05 13:37:01 -04:00
Kinan Mahdi 8d87cfdbf3 VS: Fix regression in C# source links 
Fix logic used since commit ac6b18cd90 (CSharp: Add support for source
groups with out-of-source builds, 2020-02-18, v3.18.0-rc1~645^2).
Add a check of the physical file location for C# source groups.
 2020-10-05 12:49:14 -04:00
Kyle Edwards 6f8fdc686c .gitignore: Add CMakeUserPresets.json 2020-10-05 09:54:15 -04:00
Kyle Edwards 1d25760198 Help: Add presets documentation and release notes 2020-10-05 09:49:59 -04:00
Kyle Edwards a4382f72d7 CMake GUI: Add presets functionality 2020-10-05 09:49:59 -04:00
Kyle Edwards 8617479061 CMake: Add presets functionality 2020-10-05 09:49:59 -04:00
Kyle Edwards 06128cf949 Presets: Add cmCMakePresetsFile class 2020-10-05 09:49:59 -04:00
Kyle Edwards 5a36542086 Refactor: Add allowArch parameter to cmake::CreateGlobalGenerator() 2020-10-05 09:49:59 -04:00
Kyle Edwards 3059e6aed7 cmJSONHelpers: Add new Bind() function 2020-10-05 09:49:59 -04:00
Kyle Edwards 8682d1b7b2 CMake GUI Tests: Increase default sleep time 2020-10-05 09:49:59 -04:00
Adriaan de Groot c27553afb2 cmCTestBuildHandler: Avoid uninitialized line-numbers 
When commands fail, there is no line number to report; still initialize
it explicitly to avoid compiler warnings.

Issue: #21166
 2020-10-05 09:14:32 -04:00
Adriaan de Groot e4e85c5b2d cmake: Fix uninitialized member in HandleDeleteCacheVariables 
If there is no existing value, mark the saved entry as UNINITIALIZED
(avoids compiler warning about uninitialized type).

Issue: #21166
 2020-10-05 09:13:18 -04:00
Brad King c1de2227fa Merge branch 'upstream-expat' into update-expat 
# By Expat Upstream
* upstream-expat:
  expat 2020-10-03 (162e16b0)
 2020-10-05 09:06:45 -04:00
Expat Upstream 79d5048a80 expat 2020-10-03 (162e16b0) 
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit 162e16b0a7392a20ecdb2a4d0d13b5a03a7b2380 (R_2_2_10).
 2020-10-05 09:06:45 -04:00
Brad King b788cb9d55 expat: Update script to get Expat 2.2.10 2020-10-05 09:06:35 -04:00
Brad King 0792fe4759 ci: enable IPO tests on Debian 10 and Fedora 31 builds 2020-10-05 08:57:10 -04:00
Brad King c582e51909 ci: enable Fortran submodule tests on Debian 10 and Fedora 31 builds 2020-10-05 08:57:10 -04:00
Brad King 12b56269d4 ci: enable Qt5 tests on Debian 10 and Fedora 31 builds 2020-10-05 08:57:10 -04:00
Brad King 02e8befb74 gitlab-ci: add job to run test suite on Debian 10 with ninja 2020-10-05 08:57:10 -04:00
Brad King 2bb2a283e9 ci: add packages for many find modules to the Debian 10 image 2020-10-05 08:57:10 -04:00
Brad King 03fb06b8e7 ci: enable many find module tests for the Fedora 31 Makefiles build 2020-10-05 08:57:10 -04:00
Brad King b23f36bba6 ci: add packages for many find modules to the Fedora 31 image 2020-10-05 08:57:10 -04:00
Brad King 20f7d51b7b Tests: Revise FindBLAS test to avoid cblas_ mangling 2020-10-05 08:57:10 -04:00
Brad King d77f8117cb Tests: Improve FindRuby test robustness 2020-10-05 08:57:10 -04:00
Brad King b1898bf975 Merge topic 'update-regenerate-lexers' 
a3025e2f9b Utilities/Scripts: Update regenerate-lexers.bash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5316
 2020-10-05 08:56:32 -04:00
Brad King d25c38374c Merge topic 'cuda_nvcc_abi_werror' 
079ea66468 CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Seth R Johnson <johnsonsr@ornl.gov>
Merge-request: !5318
 2020-10-05 08:54:50 -04:00
Kitware Robot a0964cbe63 CMake Nightly Date Stamp 2020-10-05 00:01:34 -04:00
Craig Scott 1291dd3103 Merge topic 'xcode-refactor-framework-linking' 
ce2dee9e5b Xcode: Don't add framework as -framework argument in linker info list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5216
 2020-10-04 17:05:57 -04:00
Craig Scott a771e2146a Merge topic 'FetchContent_missing_SOURCE_DIR' 
b030a6af88 FetchContent: Raise error if manually given source dir does not exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5317
 2020-10-04 17:02:11 -04:00
Olivier LIESS 0d86bb0902 FindBoost: Add 1.74 to known versions 2020-10-04 22:07:45 +02:00
Olivier LIESS 1940e24d58 FindBoost: Prevent warning with boost 1.74 2020-10-04 22:05:47 +02:00
Raul Tambre 079ea66468 CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags 
NVCC doesn't require an equals sign for its -Werror flags.

Fixes #21265.
 2020-10-04 09:09:21 +03:00