Commit Graph

52418 Commits

Author SHA1 Message Date
Craig Scott f536e6f3fb CPackIFW: Remove redundant variable assignment
This was showing up in cppcheck results.
2021-03-24 18:23:06 +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
Ben Boeckel e2aa44ba04 Tests: set CMAKE_PREFIX_PATH to the installation prefix
As it is documented to be.
2021-03-19 14:23:26 -04:00
Ben Boeckel 26cf661b64 Help/guide: use GNUInstallDirs in importing-exporting example
This allows the example to also show how to work on systems with
different libdir settings (e.g., Debian multiarch or Red Hat multilib)
rather than a regular `lib` directory.
2021-03-19 14:23:26 -04:00
Kyle Edwards ce6ea7c927 Refactor: Move some common code into separate file
This code is going to be needed by both cmCMakePresetsFile and
cmCMakePresetsFileReadJSON when the upcoming condition types are
created. Move it into a header file.
2021-03-19 11:30:07 -04:00
Kyle Edwards ebbd475e54 Refactor: Move cmCMakePresetsFile::ReadJSON into a separate file
Some compilers complain about translation units that are too large.
In order to prepare for upcoming additions to cmCMakePresetsFile,
split ReadJSON into a separate file.
2021-03-19 11:30:02 -04:00
Brad King 888c1cb276 Merge topic 'update_cuda_custom_toolkit_location_folder_structure'
c73b847b03 VS: switch to new folder structure while keeping the old one working

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5911
2021-03-19 11:26:20 -04:00
Brad King 8cef887b8a Merge topic 'FindDevIL-targets'
73b27f6ae8 FindDevIL: add imported targets and tests
52d3d1bdc5 FindDevIL: Format documentation of provided variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5891
2021-03-19 11:20:10 -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 8944fe453a Merge branch 'release-3.20' 2021-03-19 11:18:22 -04:00
Brad King 4acccc8b68 Merge topic 'schema-typo'
fae7910268 Help: Fix typos in presets schema field descriptions
fa1b729b9d Merge branch 'backport-preset-schema-typos' into preset-schema-typos
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 3f4ef5d787 Merge branch 'release-3.20' 2021-03-19 11:17:20 -04:00
Brad King 8ebd5521f7 Merge topic 'fix-CMP0118-NEW'
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:20 -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
Kitware Robot 87cd4f3ba0 CMake Nightly Date Stamp 2021-03-19 00:01:17 -04:00
Marcel Ritzschke c73b847b03 VS: switch to new folder structure while keeping the old one working
Fixes: #21170
2021-03-18 15:44:13 +01:00
Alex 73b27f6ae8 FindDevIL: add imported targets and tests
Fixes: #21900
2021-03-18 10:42:02 -04:00
Brad King 52d3d1bdc5 FindDevIL: Format documentation of provided variables 2021-03-18 10:39:41 -04:00
Adriaan de Groot fae7910268 Help: Fix typos in presets schema field descriptions 2021-03-18 10:09:44 -04:00
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 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 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