mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,330 Commits 2 Branches 401 Tags
3c934f88bba7dfb0ac6f532fa29adf34acca66fd
Commit Graph

52330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 3c934f88bb Merge topic 'FindOpenMP-IntelLLVM-Windows' 
6fd014a4b6 FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5904
 2021-03-17 09:15:55 -04:00
Brad King 432de16343 Merge topic 'dev/safreed/invalidconfigurepreset' 
bc663dc333 Merge branch 'master' into invalid-configure-preset
b9eb3541cf Tests: update tests to catch invalid configurePreset at read-time
83eeeff7dc Fail at read-time if configurePreset field invalid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5912
 2021-03-17 09:14:55 -04:00
Kitware Robot ac4f83d98f CMake Nightly Date Stamp 2021-03-17 00:01:19 -04:00
Brad King abf9f25d6f Merge topic 'tests-for-xctest_add_bundle' 
74eda8ab1f Tests: Add XCTest cases to cover output directory selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5888
 2021-03-16 10:52:28 -04:00
Brad King 3cea13c2f3 Merge topic 'cmake-presets-host-system-name' 
0d497e159b CMakePresets.json: Add ${hostSystemName} macro
79d03ab505 Help: Fix version numbers in CMakePresets.json documentation
69527a1979 Refactor: Pass CMakePresets.json version to ExpandMacros() functions
ad19da011d Refactor: Add cmSystemTools::GetSystemName()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5902
 2021-03-16 10:51:32 -04:00
Brad King 84f94fb196 Merge topic 'doc-configure_file-cmakedefine01' 
c13f75982f Help: Clarify configure_file #cmakedefine01 syntax and behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !5909
 2021-03-16 10:50:00 -04:00
Brad King 64026ded48 Merge topic 'ExternalData-stop-forking-to-cmake' 
b6c022eaa2 ExternalData: use `file(CREATE_LINK)`
01cc8bf930 ExternalData: use `file(COPY_FILE)` instead of forking CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5875
 2021-03-16 10:49:12 -04:00
Brad King e17303b16b Merge topic 'cstr-cleanup' 
12624ebd7e Source: Reduce c_str() usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5900
 2021-03-16 10:48:08 -04:00
Brad King 96f7c2a8bf Merge branch 'release-3.20' 2021-03-16 10:47:04 -04:00
Brad King aae3537bc6 Merge topic 'FindMatlab-r2021a' 
427f5f2fa9 FindMatlab: R2021a version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5907
 2021-03-16 10:47:03 -04:00
Brad King 68497e8b8c Merge topic 'FindMatlab-r2021a' into release-3.20 
427f5f2fa9 FindMatlab: R2021a version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5907
 2021-03-16 10:47:03 -04:00
Kyle Edwards bc663dc333 Merge branch 'master' into invalid-configure-preset 2021-03-16 10:16:02 -04:00
Kitware Robot 0cf1b5c5ad CMake Nightly Date Stamp 2021-03-16 00:01:17 -04:00
Sam Freed b9eb3541cf Tests: update tests to catch invalid configurePreset at read-time 2021-03-15 14:53:00 -07:00
Sam Freed 83eeeff7dc Fail at read-time if configurePreset field invalid 2021-03-15 14:44:43 -07:00
William R. Dieter 6fd014a4b6 FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on Windows 
The Windows driver does not like the `-f` form of this option.

Note that we prefer `-Qiopenmp/-fiopenmp` over `-Qopenmp/-fopenmp` in
order to generate LLVM IR with parallelization information, which the
backend uses to generate parallelized code.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
 2021-03-15 14:43:23 -04:00
Kyle Edwards 0d497e159b CMakePresets.json: Add ${hostSystemName} macro 2021-03-15 14:41:42 -04:00
Kyle Edwards 79d03ab505 Help: Fix version numbers in CMakePresets.json documentation 2021-03-15 14:41:42 -04:00
Kyle Edwards 69527a1979 Refactor: Pass CMakePresets.json version to ExpandMacros() functions 2021-03-15 14:41:42 -04:00
Kyle Edwards ad19da011d Refactor: Add cmSystemTools::GetSystemName() 
And use it for CMAKE_HOST_SYSTEM_NAME and CMAKE_SYSTEM_NAME.
 2021-03-15 14:41:42 -04:00
Brad King dfdea7d9e3 Merge topic 'ci-vs-16.8-in-16.9' into release-3.20 
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
 2021-03-15 13:49:23 -04:00
Brad King 336c57edd0 Merge branch 'release-3.20' 2021-03-15 13:49:23 -04:00
Brad King acdbdad1d4 Merge topic 'ci-vs-16.8-in-16.9' 
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
 2021-03-15 13:49:23 -04:00
Brad King 7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 
The 16.8 and 16.9 toolset numbers vary only in their third component.
Use CMake 3.19.7 for three-component toolset version specification
support.
 2021-03-15 12:19:00 -04:00
Brad King a5a4285f68 Merge branch 'release-3.20' 2021-03-15 12:07:02 -04:00
Brad King 06c6d01869 Merge branch 'release-3.19' into release-3.20 2021-03-15 12:06:30 -04:00
Brad King 08478c3ded Merge branch 'release-3.19' 2021-03-15 11:57:31 -04:00
Brad King 22612dd53a CMake 3.19.7 v3.19.7 2021-03-15 09:39:14 -04:00
Elsie Hupp c13f75982f Help: Clarify configure_file #cmakedefine01 syntax and behavior 
Fixes: #21935
 2021-03-15 09:15:08 -04:00
Michael Hirsch 427f5f2fa9 FindMatlab: R2021a version map 2021-03-15 09:10:07 -04:00
Brad King 05d2a5175b Merge branch 'release-3.20' 2021-03-15 08:52:13 -04:00
Brad King 76b1b0b976 Merge branch 'release-3.19' into release-3.20 2021-03-15 08:52:09 -04:00
Brad King a38505bfa9 Merge branch 'release-3.19' 2021-03-15 08:51:53 -04:00
Brad King 1e2513b612 Merge topic 'vs-toolset-version' into release-3.20 
30c835428f VS: Accept and translate '-T version=' values with three components
58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9
09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5903
 2021-03-15 08:50:13 -04:00
Brad King 6716bee1db Merge branch 'release-3.20' 2021-03-15 08:50:13 -04:00
Brad King 3d661c6c3a Merge topic 'vs-toolset-version' 
30c835428f VS: Accept and translate '-T version=' values with three components
58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9
09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5903
 2021-03-15 08:50:13 -04:00
Brad King 0561664569 Merge topic 'cmake-print-properties-cache-fix' 
bb9a701a2b CMakePrintHelpers: Work around CACHE argument of set()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5901
 2021-03-15 08:49:26 -04:00
Kitware Robot 948b379e26 CMake Nightly Date Stamp 2021-03-15 00:01:19 -04:00
Kitware Robot d4053aabce CMake Nightly Date Stamp 2021-03-14 00:01:09 -05:00
vvs31415 12624ebd7e Source: Reduce c_str() usage 2021-03-13 07:36:07 -05:00
Kitware Robot 982f7bb506 CMake Nightly Date Stamp 2021-03-13 00:01:18 -05:00
Yauheni Khnykin 74eda8ab1f Tests: Add XCTest cases to cover output directory selection 
Fixes: #21800
 2021-03-13 00:54:25 +01:00
Brad King c141a8be9e Merge topic 'ci-build-no-doc' into release-3.20 
9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5905
 2021-03-12 13:27:09 -05:00
Brad King e3009f16e9 Merge branch 'release-3.20' 2021-03-12 13:27:09 -05:00
Brad King aed12e10eb Merge topic 'ci-build-no-doc' 
9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5905
 2021-03-12 13:27:09 -05:00
Brad King 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs 
The Sphinx build is mostly serial and takes a long time.  All our CI
pipelines (packaging, integration branches, merge requests) have a
dedicated job for the Sphinx build.
 2021-03-12 13:05:55 -05:00
Brad King c540b611b8 Merge branch 'vs-toolset-version' into release-3.19 
Merge-request: !5903
 2021-03-12 09:26:25 -05:00
Brad King 30c835428f VS: Accept and translate '-T version=' values with three components 
The VS 16.8 and VS 16.9 toolset versions differ only in their third
component.  The `vcvarsall` option `-vcvars_ver=` accepts a three
component version, so accept this format for VS toolset selection too.

Issue: #21922
 2021-03-12 08:36:45 -05:00
Brad King 58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9 
CMake accepts the toolset version that is default in the current VS
version by matching the name later VS versions will use for the SxS
props files.  It predicts the future name based on the first two
components of the current VS version's default toolset.  However, this
heuristic breaks naming the VS 16.8 toolset version 14.28 under VS 16.9
because the latter's default toolset version is 14.28.29910, which did
not increment the second version component (unprecedented in VS).

Fix this by always using the requested version's SxS props file when it
exists, even if it matches the first two components of the current VS
version's default toolset.  Also add a special case for the name VS
16.10 will use for VS 16.9's default toolset, so that it can be used
with VS 16.9 too.

Fixes: #21922
 2021-03-12 08:36:40 -05:00
Brad King 09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name 2021-03-12 06:33:51 -05:00