mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 13:22:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,357 Commits 2 Branches 396 Tags
51cb836c44dc41411afcaee9869d262f7be70d7d
Commit Graph

52357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
51cb836c44 Merge branch 'release-3.20' 2021-03-17 09:41:08 -04:00
Brad King
6fb2ce6956 Merge branch 'release-3.19' into release-3.20 2021-03-17 09:40:55 -04:00
Brad King
63eb16db20 Merge branch 'release-3.19' 2021-03-17 09:40:37 -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
d95027a573 Merge branch 'release-3.20' 2021-03-17 09:39:38 -04:00
Brad King
03a61ae509 Merge topic 'ninja-regenerate-no-recompact' 
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:38 -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
3e112cc510 Merge branch 'release-3.20' 2021-03-17 09:38:47 -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
87c6fe4997 Merge topic 'FindPkgConfig-NAMES_PER_DIR' 
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
0f63a64b61 Merge branch 'release-3.20' 2021-03-17 09:36:48 -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
f692d67d8c Merge branch 'ci-vs-16.8-in-16.9' 
Merge-request: !5918
 2021-03-17 09:36:11 -04:00
Brad King
9ae3928eec Merge branch 'release-3.20' 2021-03-17 09:29:59 -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
1dd62df37e Merge topic 'fix_ninja_windows_cuda' 
55233eee42 CUDA: Add support for finding nvcc in CUDA_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5908
 2021-03-17 09:24:45 -04:00
Brad King
649976e9a6 Merge topic 'doc-flag-var-strings' 
95c50da8af Help: Document that CMAKE_<LANG>_FLAGS[_INIT] are strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5915
 2021-03-17 09:24:04 -04:00
Alexander Richardson
95c50da8af Help: Document that CMAKE_<LANG>_FLAGS[_INIT] are strings 
Issue: #21944
 2021-03-17 09:22:52 -04:00
Brad King
7a9fb6a9c9 Merge branch 'release-3.20' 2021-03-17 09:15:55 -04:00
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
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
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
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
Kitware Robot
ac4f83d98f CMake Nightly Date Stamp 2021-03-17 00:01:19 -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
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
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
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
Kyle Edwards
bc663dc333 Merge branch 'master' into invalid-configure-preset 2021-03-16 10:16:02 -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
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
Tobias Ribizel
55233eee42 CUDA: Add support for finding nvcc in CUDA_PATH 
Previously, nvcc needed to be present in PATH or specified by CUDACXX.
On Windows with vcpkg, the PATH is heavily modified, which lead to
nvcc not being found with the Ninja generator.
 2021-03-15 21:34:05 +01: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