mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 14:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,205 Commits 2 Branches 401 Tags
75bcd3cf54bc483b49dc4ed1d7ee9d36f5f58732
Commit Graph

50205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 75bcd3cf54 Tests: Add RunCMake.GNUInstallDirs expected output specific to Debian 2020-10-08 11:09:37 -04:00
Brad King 8f2ba9a3fc Merge topic 'ignore_MSB_warnings' 
b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5348
 2020-10-08 09:29:02 -04:00
Anonymous Maarten b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings 
When building CMake in `%TMP%` on Windows, MSBuild issues warnings.
Filter those out to avoid breaking C++ feature checks.

Fixes: #21270
 2020-10-08 09:24:02 -04:00
Brad King 20d140c894 Merge topic 'android-ndk-r22' 
1ab574a0f4 Android: Add support for NDK r22
91a362d2fa Android: Drop redundant setting of CMP0057 in Android-Determine
0b082c5253 Android: Select Android API after ABI is determined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5332
 2020-10-08 09:23:37 -04:00
Brad King bc19ceb6fe Merge topic 'check_cuda_helpers' 
5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA
da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5338
 2020-10-08 09:22:21 -04:00
Robert Maynard 5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA 2020-10-08 08:30:59 -04:00
Robert Maynard da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags 2020-10-08 08:30:59 -04:00
Brad King 96dcf07d33 Merge topic 'FindwxWidgets-freebsd' 
1fe5abb47f FindwxWidgets: Expand list of names for wx-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5342
 2020-10-08 08:10:41 -04:00
Brad King 736cd0f533 Merge topic 'FindJNI-freebsd' 
79bfa0f75e FindJNI: Search in FreeBSD standard locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5341
 2020-10-08 08:09:53 -04:00
Brad King ef889ede4c Merge topic 'FindPython-fix-tests-failures' 
2549dc7c93 FindPython: Enable C language in tests that find the Development component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5344
 2020-10-08 08:08:08 -04:00
Kitware Robot 75a486f8c0 CMake Nightly Date Stamp 2020-10-08 00:01:15 -04:00
Haibo Huang 1ab574a0f4 Android: Add support for NDK r22 
NDK r22 removed platforms and sysroot directory.
NDK r18+ provides `.cmake` files with tables of platforms and abis.
 2020-10-07 16:18:10 -07:00
Haibo Huang 91a362d2fa Android: Drop redundant setting of CMP0057 in Android-Determine 
A module-wide setting was added by commit 8ede35523e (IN_LIST: Ensure
policy allows if(IN_LIST) if used by a module, 2018-09-12,
v3.13.0-rc1~95^2), so our local setting is no longer needed.
 2020-10-07 16:17:36 -07:00
Haibo Huang 0b082c5253 Android: Select Android API after ABI is determined 
API level depends on ABI. E.g. for LP64 the minimum API level should be 21 instead of 16 for others.
 2020-10-07 16:13:56 -07:00
Kyle Edwards a354440de9 Merge topic 'vs-android-doc' 
0a638e86b2 Help: Add note about Visual Studio tools for Android
55689ce800 Help: Add ref to Ninja Generators section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5343
 2020-10-07 14:16:40 -04:00
Marc Chevrier 2549dc7c93 FindPython: Enable C language in tests that find the Development component 
Since commit 5537ccd814 (FindPython: Tests optimizations, 2020-10-01)
some FindPython tests fail because the Development component cannot be
found without knowing `CMAKE_LIBRARY_ARCHITECTURE`.  Enable at least one
language in each of these test cases to get that value.  This is
consistent with use in practice because the Development component does
not make much sense without a language to compile sources anyway.

Fixes: #21277
 2020-10-07 12:01:43 -04:00
Kyle Edwards 0a638e86b2 Help: Add note about Visual Studio tools for Android 2020-10-07 10:24:38 -04:00
Kyle Edwards 55689ce800 Help: Add ref to Ninja Generators section 2020-10-07 10:23:31 -04:00
Adriaan de Groot 79bfa0f75e FindJNI: Search in FreeBSD standard locations 2020-10-07 10:12:49 -04:00
Adriaan de Groot 1fe5abb47f FindwxWidgets: Expand list of names for wx-config 
This looks for the FreeBSD-packaging names of wx-config as well.

Fixes: #19372
 2020-10-07 10:11:18 -04:00
Brad King 2e53641d76 Merge topic 'user-interaction-presets' 
4bdc1c0a2c Help: Update user interaction guide with presets info

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5340
 2020-10-07 07:48:24 -04:00
Brad King c4c86acaac Merge topic 'cmake-presets-empty-var' 
a395cb516b CMakePresets.json: Prohibit empty variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5339
 2020-10-07 07:25:52 -04:00
Brad King c61f820a7f Merge topic 'add_ispc_to_check_helpers' 
e17e2c6a51 ISPC: CheckCompilerFlags and CheckSourceCompiles support ISPC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5337
 2020-10-07 07:13:21 -04:00
Brad King 026beeb620 Merge topic 'CheckCompilerFlag-gcc-10' 
d66858c8e4 CheckCompilerFlag: Update the regex used to detect invalid options for GCC 10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5331
 2020-10-07 07:12:31 -04:00
Brad King 7f1a36deea Merge topic 'ci-nightly' 
dd47d0d7f4 gitlab-ci: add rules to enable jobs in a nightly pipeline schedule
3f494b12ea gitlab-ci: configure continuous job ctest build name and model accordingly
63c7e7ca04 gitlab-ci: factor out ctest_start() model into a variable
0556bd2f8a gitlab-ci: use ctest_start GROUP option instead of deprecated TRACK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5334
 2020-10-07 07:09:09 -04:00
Brad King dd47d0d7f4 gitlab-ci: add rules to enable jobs in a nightly pipeline schedule 2020-10-07 06:16:51 -04:00
Brad King 3f494b12ea gitlab-ci: configure continuous job ctest build name and model accordingly 2020-10-07 06:16:28 -04:00
Brad King 63c7e7ca04 gitlab-ci: factor out ctest_start() model into a variable 2020-10-07 06:12:44 -04:00
Brad King 0556bd2f8a gitlab-ci: use ctest_start GROUP option instead of deprecated TRACK 2020-10-07 06:12:05 -04:00
Kitware Robot a410755597 CMake Nightly Date Stamp 2020-10-07 00:01:18 -04:00
Kyle Edwards 4bdc1c0a2c Help: Update user interaction guide with presets info 2020-10-06 16:11:50 -04:00
Kyle Edwards 62895f9d74 Merge topic 'ide-integration-guide' 
6e10518cbc Help: Add IDE integration guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5298
 2020-10-06 13:20:42 -04:00
Kyle Edwards a395cb516b CMakePresets.json: Prohibit empty variable names 2020-10-06 12:09:38 -04:00
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
Robert Maynard e17e2c6a51 ISPC: CheckCompilerFlags and CheckSourceCompiles support ISPC 2020-10-06 10:47:20 -04:00
Brad King a12da6fb5e Merge branch 'release-3.18' into master 2020-10-06 10:41:36 -04:00
Luthaf d66858c8e4 CheckCompilerFlag: Update the regex used to detect invalid options for GCC 10 
The warning emmitted by GCC for invalid options have been updated to
read "command-line option XXX is valid ..." instead of "command line
option XXX is valid ...".  Update the regex to make it valid with both
the old and new warning message.

Fixes: #21275
 2020-10-06 10:38:18 -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