mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-23 08:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,379 Commits 2 Branches 403 Tags
fa1b729b9d15bef7cf71501573b86be97d69ee84
Commit Graph

52379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King fa1b729b9d Merge branch 'backport-preset-schema-typos' into preset-schema-typos 2021-03-18 10:09: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 7483843816 Merge topic 'lang_win32_console' 
56c759b000 Per-language Win32/Console flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5906
 2021-03-18 09:42:44 -04:00
Brad King f3d9cedc8b Merge topic 'fileapi-codemodel-directory' 
049bf98f63 fileapi: Add installers to codemodel-v2 "directory" object
eae2256a52 fileapi: Add backtraceGraph to codemodel-v2 "directory" object
a12d7f70b1 fileapi: Add a "directory" object to codemodel-v2
fd30bd93e6 fileapi: Re-organize backtrace infrastructure
415ead8153 cmFileAPICodemodel: Build map from each target to its index
f73b6879e9 cmInstallTargetGenerator: Report namelink mode with list of files
ea430582f9 cmInstallTargetGenerator: Drop unused GetNamelinkMode method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5917
 2021-03-18 09:41:59 -04:00
Brad King 1d34a153c0 Merge topic 'ci-intel-compilers' 
1610c0f034 gitlab-ci: add jobs testing Intel oneAPI compilers on Linux
c076833310 gitlab-ci: add jobs testing Intel Classic compilers on Linux
5ea928d9d2 gitlab-ci: factor out job dependencies on release-style binaries
402518904f gitlab-ci: add rules to enable jobs only in a nightly pipeline schedule
747940157f gitlab-ci: init environment with per-CMAKE_CONFIGURATION shell scripts
256c320fb6 gitlab-ci: add variable for job to control its ctest build name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5920
 2021-03-18 09:41:13 -04:00
Kitware Robot dd952f28e9 CMake Nightly Date Stamp 2021-03-18 00:01:15 -04:00
Raul Tambre 56c759b000 Per-language Win32/Console flags 
Allows using different compilers with different flags for different languages.
For example Clang with GNU-like commandline for CXX and MSVC as host compiler
for CUDA.

Should help with #21914.
 2021-03-17 17:51:56 +02:00
Brad King 1610c0f034 gitlab-ci: add jobs testing Intel oneAPI compilers on Linux 2021-03-17 11:41:26 -04:00
Brad King c076833310 gitlab-ci: add jobs testing Intel Classic compilers on Linux 2021-03-17 11:41:26 -04:00
Brad King 5ea928d9d2 gitlab-ci: factor out job dependencies on release-style binaries 2021-03-17 11:41:25 -04:00
Brad King 402518904f gitlab-ci: add rules to enable jobs only in a nightly pipeline schedule 2021-03-17 11:41:25 -04:00
Brad King 747940157f gitlab-ci: init environment with per-CMAKE_CONFIGURATION shell scripts 2021-03-17 11:41:25 -04:00
Brad King 256c320fb6 gitlab-ci: add variable for job to control its ctest build name 2021-03-17 11:41:25 -04:00
Brad King 773df911c1 Merge branch 'release-3.20' 2021-03-17 11:06:26 -04:00
Brad King fab7fe7ef5 CMake 3.20.0-rc5 v3.20.0-rc5 2021-03-17 10:16:33 -04:00
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 049bf98f63 fileapi: Add installers to codemodel-v2 "directory" object 
Co-Authored-by: Kyle Edwards <kyle.edwards@kitware.com>
 2021-03-16 16:47:57 -04:00
Brad King eae2256a52 fileapi: Add backtraceGraph to codemodel-v2 "directory" object 
Co-Authored-by: Kyle Edwards <kyle.edwards@kitware.com>
 2021-03-16 16:47:55 -04:00
Brad King a12d7f70b1 fileapi: Add a "directory" object to codemodel-v2 
This object will contain more detailed directory-level information.

Co-Authored-by: Kyle Edwards <kyle.edwards@kitware.com>
 2021-03-16 16:47:43 -04:00
Brad King fd30bd93e6 fileapi: Re-organize backtrace infrastructure 
Make it available to more parts of the codemodel object.
 2021-03-16 11:24:41 -04:00
Brad King 415ead8153 cmFileAPICodemodel: Build map from each target to its index 2021-03-16 11:24:28 -04:00
Brad King f73b6879e9 cmInstallTargetGenerator: Report namelink mode with list of files 2021-03-16 11:06:46 -04:00
Brad King ea430582f9 cmInstallTargetGenerator: Drop unused GetNamelinkMode method 2021-03-16 11:06:46 -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