mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,498 Commits 2 Branches 401 Tags
25ccb2c7c31dd44d53fdea3b3610efcdffc8634c
Commit Graph

52498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 40b806ee96 Merge topic 'ninja-multi-long-custom-command' 
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
Craig Scott 900184616a Cleanup: Fix misspelt name of local C++ variable 2021-03-26 22:17:57 +11:00
Craig Scott 635431a0c9 Tests: Check host platform instead of target for running stat 2021-03-26 22:17:57 +11:00
Craig Scott 4ceb0ca59e Tests: Remove redundant files for configure_file() tests 2021-03-26 22:17:57 +11:00
Kitware Robot 61fd90b90c CMake Nightly Date Stamp 2021-03-26 00:01:21 -04:00
Ben Boeckel 739446a9a1 FindDoxygen: clarify the CMake variable naming scheme 2021-03-25 16:54:08 -04:00
Matt Jaeger 2fe39dc306 cmake: Fix loading CMake sources from long paths on Windows 
Pass a Windows extended path to the lexer so it can open long paths.
 2021-03-25 15:49:48 -04:00
Pedro Luis Castedo Cepeda 238c2b6cb7 FindRuby: Consider ruby names with full nodot version suffixes 2021-03-25 15:30:09 -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 0020f69848 Merge topic 'ci-intel-compilers' 
d1b23dd468 gitlab-ci: update Intel Compiler base image tag naming convention

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5937
 2021-03-25 10:25:36 -04:00
Brad King f45a1c4d2e Merge branch 'release-3.20' 2021-03-25 10:24:38 -04:00
Brad King ea4c344453 Merge topic 'doc-custom-output-genex' 
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:38 -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 11bfd4d479 Merge branch 'release-3.20' 2021-03-25 10:23:25 -04:00
Brad King fde2347f98 Merge topic 'nsis-branding-trim-position' 
f226a1678f Merge branch 'master' into nsis-branding-trim-position
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:25 -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
Kitware Robot c0aa4244f5 CMake Nightly Date Stamp 2021-03-25 00:01:17 -04:00
Brad King d1b23dd468 gitlab-ci: update Intel Compiler base image tag naming convention 2021-03-24 16:45:47 -04:00
Brad King 7cbc2004f5 Merge branch 'release-3.20' 2021-03-24 16:45:18 -04:00
Brad King fb91e21e46 Merge branch 'release-3.19' into release-3.20 2021-03-24 16:45:13 -04:00
Brad King c60b0914af Merge branch 'release-3.19' 2021-03-24 16:45:06 -04:00
Brad King c0919520ec Merge branch 'release-3.20' 2021-03-24 16:44:04 -04:00
Brad King 9166efa459 Merge topic 'ci-msvc-14.28-16.9' 
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:04 -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 f536e6f3fb CPackIFW: Remove redundant variable assignment 
This was showing up in cppcheck results.
 2021-03-24 18:23:06 +11:00
Craig Scott f226a1678f Merge branch 'master' into nsis-branding-trim-position 2021-03-24 16:35:49 +11:00
Craig Scott a6a5256395 CPack: Validate and document NSIS branding text trim positions 2021-03-24 16:35:29 +11:00
Kitware Robot 88060f4717 CMake Nightly Date Stamp 2021-03-24 00:01:16 -04:00
Brad King 859241d2bb Merge branch 'release-3.20' 2021-03-23 12:36:53 -04:00
Brad King b7b0fb4303 CMake 3.20.0 v3.20.0 2021-03-23 11:43:17 -04:00
Brad King 0310097377 Merge topic 'vs-custom-flag-table' 
608ef8a6fc VS: Add a mostly-undocumented hook to load custom JSON flag tables
8dd8d63665 Tests: Add RunCMake hook to describe test variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5895
 2021-03-23 11:20:18 -04:00
Brad King 6dbf1770c6 Merge branch 'release-3.20' 2021-03-23 10:34:51 -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
Brad King 08e3961f80 Merge topic 'doc-xcoff-chrpath' 
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
Brad King 928f4bda30 Merge topic 'cmake-presets-condition' 
8bc5c8961e CMakePresets.json: Add the ability to conditionally disable presets
ce6ea7c927 Refactor: Move some common code into separate file
ebbd475e54 Refactor: Move cmCMakePresetsFile::ReadJSON into a separate file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5919
 2021-03-23 10:33:59 -04:00
Brad King a740e8b311 Merge topic 'cxx-module-extensions' 
7c4c4f1406 Treat '.ixx' and '.cppm' files as C++ sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5926
 2021-03-23 10:33:03 -04:00
Brad King b836c07fba Merge topic 'better-exporting-examples' 
e2aa44ba04 Tests: set CMAKE_PREFIX_PATH to the installation prefix
26cf661b64 Help/guide: use GNUInstallDirs in importing-exporting example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5923
 2021-03-23 10:32:02 -04:00
Kitware Robot 6e7ff52af7 CMake Nightly Date Stamp 2021-03-23 00:01:09 -04:00
Kyle Edwards 8bc5c8961e CMakePresets.json: Add the ability to conditionally disable presets 2021-03-22 15:04:54 -04:00
Brad King 608ef8a6fc VS: Add a mostly-undocumented hook to load custom JSON flag tables 
The names and formats of our VS flag tables are internal implementation
details.  However, some institutions need to maintain support for
non-public VS platforms and toolsets.  Provide a hook that their
projects can use to load custom flag table files.  This helps avoid
distributing a custom CMake package within such institutions.

Document the hook itself, but explicitly specify that the files the
hook loads are not considered a stable interface.
 2021-03-22 13:28:27 -04:00
Brad King 8dd8d63665 Tests: Add RunCMake hook to describe test variants 2021-03-22 13:26:29 -04:00
Andrew Gilewsky 7c4c4f1406 Treat '.ixx' and '.cppm' files as C++ sources 
These extensions are used by convention for C++ modules and interface
units with MSVC.
 2021-03-22 11:58:44 -04:00
Craig Scott 4a9fb82030 Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF too 2021-03-22 11:48:01 -04:00
Kitware Robot 6d4cbf7416 CMake Nightly Date Stamp 2021-03-22 00:01:18 -04:00
Kitware Robot 8f0cbaf2e0 CMake Nightly Date Stamp 2021-03-21 00:03:25 -04:00
Kitware Robot 9b4390e76b CMake Nightly Date Stamp 2021-03-20 00:01:15 -04:00