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
52,047 Commits 2 Branches 401 Tags
99dd2a6e159cc72cd76809d22abd13d07c99e849
Commit Graph

52047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 99dd2a6e15 Merge topic 'FindIntl-builtin' into release-3.20 
e34d64c04d FindIntl: Fix detection of intl built in to C library
cb0d1a49e6 FindIntl: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jeremy Tan <jtanx@outlook.com>
Acked-by: David Adam <zanchey@ucc.gu.uwa.edu.au>
Merge-request: !5948
 2021-03-29 09:31:02 -04:00
Brad King 0e37e0d215 Merge topic 'correct_arg_parsing' into release-3.20 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
 2021-03-29 09:29:39 -04:00
Brad King e34d64c04d FindIntl: Fix detection of intl built in to C library 
Since commit c30d06b7e6 (FindIntl: Add imported target, 2020-10-06,
v3.20.0-rc1~687^2) we use `check_symbol_exists` to check whether the
`intl` library is built in to the C library.  On some platforms the
tested symbols are provided as macros so the check passes without
linking any symbol.  Instead, check whether a sample source file both
compiles and links.

Fixes: #21979
 2021-03-26 11:01:34 -04:00
Sibi Siddharthan cb0d1a49e6 FindIntl: Improve documentation formatting 
Backport from commit a9b11a06f5 (FindIntl: Add version support, 2021-02-23).
 2021-03-26 10:38:53 -04:00
Robert Maynard 79d7bcaf40 cmCommandLineArgument: correctly compute next parse index 
Fixes #21966

Correctly compute the next parse index for `ZeroOrOne` when
it is zero, and for OneOrMore.
 2021-03-26 09:34:46 -04:00
Brad King 2a2afe0ae4 Merge topic 'ninja-multi-long-custom-command' into release-3.20 
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5941
 2021-03-26 09:23:19 -04:00
Kyle Edwards 3b864b2583 Ninja Multi-Config: Include configs in long CC scripts 
Fixes: #21973
 2021-03-25 13:18:47 -04:00
Brad King fef28dbc1e Merge topic 'doc-custom-output-genex' into release-3.20 
2f59b683d3 Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5939
 2021-03-25 10:24:37 -04:00
Brad King 3e4e02dcc5 Merge topic 'nsis-branding-trim-position' into release-3.20 
a6a5256395 CPack: Validate and document NSIS branding text trim positions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5928
 2021-03-25 10:23:24 -04:00
Craig Scott 2f59b683d3 Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targets 
Relates: #21364
 2021-03-25 18:04:17 +11:00
Brad King fb91e21e46 Merge branch 'release-3.19' into release-3.20 2021-03-24 16:45:13 -04:00
Brad King 52b77060c8 Merge topic 'ci-msvc-14.28-16.9' into release-3.20 
472a11c3d2 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9
3a042bef8e gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5935
 2021-03-24 16:44:02 -04:00
Brad King 0913499f69 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into release-3.19 
Merge-request: !5935
 2021-03-24 10:22:29 -04:00
Brad King 472a11c3d2 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9 2021-03-24 10:20:35 -04:00
Brad King 3a042bef8e gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolset 2021-03-24 10:18:30 -04:00
Craig Scott a6a5256395 CPack: Validate and document NSIS branding text trim positions 2021-03-24 16:35:29 +11:00
Brad King b7b0fb4303 CMake 3.20.0 v3.20.0 2021-03-23 11:43:17 -04:00
Brad King 5e4396dd21 Merge topic 'doc-xcoff-chrpath' into release-3.20 
4a9fb82030 Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5925
 2021-03-23 10:34:50 -04:00
Craig Scott 4a9fb82030 Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF too 2021-03-22 11:48:01 -04:00
Brad King 3d9aa96fca Merge topic 'schema-typo' into release-3.20 
bda6446e6f Help: Fix typos in presets schema field descriptions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5922
 2021-03-19 11:18:22 -04:00
Brad King 27cd678e77 Merge topic 'fix-CMP0118-NEW' into release-3.20 
17eb610a31 Help: Document CMP0118 requirement for boolean values
06feb845aa CMP0118: Fix NEW behavior when looking up target sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5921
 2021-03-19 11:17:19 -04:00
Adriaan de Groot bda6446e6f Help: Fix typos in presets schema field descriptions 2021-03-18 10:07:09 -04:00
Brad King 17eb610a31 Help: Document CMP0118 requirement for boolean values 2021-03-18 10:00:02 -04:00
Brad King 06feb845aa CMP0118: Fix NEW behavior when looking up target sources 
Under the CMP0118 NEW behavior, sources generated in one directory
should be visible when added to targets in other directories.  This was
accidentally left out of commit 6624b65b3f (GENERATED prop: Add
implementation for policy CMP0118 being set to NEW, 2020-11-09,
v3.20.0-rc1~393^2~1).

Fixes: #18399
 2021-03-18 09:57:49 -04:00
Brad King fab7fe7ef5 CMake 3.20.0-rc5 v3.20.0-rc5 2021-03-17 10:16:33 -04:00
Brad King 6fb2ce6956 Merge branch 'release-3.19' into release-3.20 2021-03-17 09:40:55 -04:00
Brad King 1e79c230fa Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19 
Merge-request: !5918
 2021-03-17 09:40:14 -04:00
Brad King 74a65b0033 Merge topic 'ninja-regenerate-no-recompact' into release-3.20 
6fd9c68ed0 Ninja: Do not recompact deps log in regeneration during a build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5916
 2021-03-17 09:39:37 -04:00
Brad King d6acaa7bbd Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20 
c7bd2d0d97 FindPkgConfig: Restore preference for first pkg-config in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5914
 2021-03-17 09:38:47 -04:00
Brad King ec9a2db02c Merge branch 'ci-vs-16.8-in-16.9' into release-3.20 2021-03-17 09:36:42 -04:00
Brad King ed23c29ac5 Merge branch 'invalid-configure-preset' into release-3.20 
Merge-request: !5912
 2021-03-17 09:28:12 -04:00
Brad King 75aa444fd8 Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20 
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:54 -04:00
Brad King 53f69272c8 Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into ci-vs-16.8-in-16.9 2021-03-17 09:07:38 -04:00
Brad King 9f36461e12 gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 in CMake 3.19 branch 
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-17 09:05:52 -04:00
Brad King 80255a5aa9 Merge branch 'ninja-regenerate-no-recompact' into release-3.19 
Merge-request: !5916
 2021-03-16 10:55:07 -04:00
Brad King 5aa01927c0 Merge branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19 
Merge-request: !5914
 2021-03-16 10:54:48 -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
Brad King 6fd9c68ed0 Ninja: Do not recompact deps log in regeneration during a build 
Since commit fb18215904 (Ninja: clean ninja metadata once generated,
2019-05-13, v3.17.0-rc1~207^2) we recompact the ninja deps log during
regeneration.  That does not make sense during a build, so skip it if we
are regenerating during a build.

This problem went unnoticed previously because on non-Windows platforms
the deps log is just overwritten again by the outer build.  On Windows
platforms, recompaction during the build fails, but we did not actually
try to do that until commit 11f4259362 (Ninja: Clean metadata after
regen during build on Windows with 1.10.2+, 2020-11-30, v3.19.2~29^2~1).

Fixes: #21916
 2021-03-16 09:37:35 -04:00
Brad King c7bd2d0d97 FindPkgConfig: Restore preference for first pkg-config in PATH 
Since commit ab8bd48352 (FindPkgConfig: Search for pkg-config.bat file
on a Windows host, 2020-09-25, v3.19.0-rc1~98^2) we prefer
`pkg-config.bat` over `pkg-config` regardless of the order they appear
in the `PATH`.  Tell `find_program` to consider all names in each
directory so that the first one in `PATH` of any name wins.

Issue: #21239
 2021-03-16 09:04:56 -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
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 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 06c6d01869 Merge branch 'release-3.19' into release-3.20 2021-03-15 12:06:30 -04:00
Brad King 22612dd53a CMake 3.19.7 v3.19.7 2021-03-15 09:39:14 -04:00
Michael Hirsch 427f5f2fa9 FindMatlab: R2021a version map 2021-03-15 09:10:07 -04:00
Brad King 76b1b0b976 Merge branch 'release-3.19' into release-3.20 2021-03-15 08:52:09 -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 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