Commit Graph

52281 Commits

Author SHA1 Message Date
Brad King e3009f16e9 Merge branch 'release-3.20' 2021-03-12 13:27:09 -05:00
Brad King aed12e10eb Merge topic 'ci-build-no-doc'
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
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
Brad King 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs
The Sphinx build is mostly serial and takes a long time.  All our CI
pipelines (packaging, integration branches, merge requests) have a
dedicated job for the Sphinx build.
2021-03-12 13:05:55 -05:00
Kitware Robot 887e0c6c7b CMake Nightly Date Stamp 2021-03-12 00:01:17 -05:00
Brad King 871fc92929 Merge branch 'release-3.20' 2021-03-11 10:21:28 -05:00
Brad King c69d4b177f CMake 3.20.0-rc4 v3.20.0-rc4 2021-03-11 09:23:18 -05:00
Brad King 2da1a8f92d Merge branch 'release-3.20' 2021-03-11 08:30:38 -05:00
Brad King 8b82b70292 Merge branch 'release-3.19' into release-3.20 2021-03-11 08:30:33 -05:00
Brad King 4c44d1b63d Merge branch 'release-3.19' 2021-03-11 08:30:25 -05:00
Brad King 9a80ce6d24 Merge topic 'add_prefix_cmake_option'
400536c317 cmCommandLineArgument: trim leading empty spaces
b227a9565e cmake: configure preset add support for --install-prefix mapping
38140713ad cmake: add support for --install-prefix command argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5843
2021-03-11 08:16:03 -05:00
Brad King 0d7389c04e Merge topic 'cpack-source-dir-symlink-test'
f42b048b9c Tests: Check symlinks to directories in RunCMake.CPackSymlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5887
2021-03-11 08:14:19 -05:00
Brad King 00eb4df37e Merge topic 'file-COPY_FILE-subcommand'
088444211e file: add `COPY_FILE` subcommand
100016e9cb cmSystemTools: add utilities to copy a file with error handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5885
2021-03-11 08:13:29 -05:00
Brad King 4606082742 Merge topic 'xcode-framework-quoting' into release-3.20
4f9a71974e Xcode: Restore support for spaces in framework names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5899
2021-03-11 08:10:42 -05:00
Brad King 6cb61bc576 Merge branch 'release-3.20' 2021-03-11 08:10:42 -05:00
Brad King e6695c7ad5 Merge topic 'xcode-framework-quoting'
00ecddd9eb Tests: Enable Framework test case with spaces everywhere possible
b6cc9be009 Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quoting
4f9a71974e Xcode: Restore support for spaces in framework names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5899
2021-03-11 08:10:42 -05:00
Brad King fd64bf5738 Merge branch 'release-3.20' 2021-03-11 08:09:33 -05:00
Brad King 33900e3c7c Merge topic 'cray-compiler-wrapper-detection'
13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5897
2021-03-11 08:09:33 -05:00
Brad King f59a3e2148 Merge topic 'cray-compiler-wrapper-detection' into release-3.20
13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5897
2021-03-11 08:09:32 -05:00
Kitware Robot 8dacf533a9 CMake Nightly Date Stamp 2021-03-11 00:01:17 -05:00
Olivier Iffrig f42b048b9c Tests: Check symlinks to directories in RunCMake.CPackSymlinks
Regression test for issue #21886
2021-03-10 17:39:55 +00:00
Brad King acdbf64047 Merge branch 'cray-compiler-wrapper-detection' into release-3.19
Merge-request: !5897
2021-03-10 12:13:52 -05:00
Justin LaPolla 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms
Previously were checking for the `__CRAYXC` and `__CRAYXE` predefined
macros.  These macros reflect the platform that the compiler wrapper is
running on, i.e. Cray XC and Cray XE machines.  They are not defined on
other platforms such as Apollo80.

Switch to the `__CRAYXT_COMPUTE_LINUX_TARGET` macro. The Cray cc/CC/ftn
wrappers always define this macro on the command line. This macro has
been in use for many years, and is believed to be a reliable way to
detect current and older Cray compiler wrappers.

Fixes: #21904
2021-03-10 12:13:17 -05:00
Brad King ccfa0852c0 Merge topic 'ep-fc-revert-refactoring' into release-3.20
57d442e182 Revert ExternalProject and FetchContent refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5898
2021-03-10 11:37:15 -05:00
Brad King f29814c607 Merge branch 'release-3.20' 2021-03-10 11:37:15 -05:00
Brad King 03193a9e9a Merge topic 'ep-fc-revert-refactoring'
57d442e182 Revert ExternalProject and FetchContent refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5898
2021-03-10 11:37:15 -05:00
Brad King 589106be68 Merge branch 'release-3.20' 2021-03-10 11:36:29 -05:00
Brad King e89a1367b6 Merge topic 'FindMatlab-MCR-vars'
5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5896
2021-03-10 11:36:29 -05:00
Brad King 845c8c72de Merge topic 'FindMatlab-MCR-vars' into release-3.20
5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5896
2021-03-10 11:36:28 -05:00
Brad King f99ff2beb9 Merge branch 'backport-xcode-framework-quoting' into release-3.19
Merge-request: !5899
2021-03-10 11:28:40 -05:00
Brad King f23aa1c120 Merge topic 'ninja-utf8'
9af6e2e7b2 Ninja: Use new wincodepage tool to determine encoding

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5860
2021-03-10 11:24:39 -05:00
Brad King fb40808b76 Merge topic 'test-ifort-windows'
7b0ab0439d Tests: Fix FortranModules test with Intel compiler on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5894
2021-03-10 11:23:23 -05:00
Brad King dad1732e45 Merge topic 'test-RunCMake-fail-info'
e8065554a8 Tests: Teach RunCMake to always print the command on failure
5f03744e36 Tests: Move RunCMake option construction closer to use
f4d154755a Tests: Reverse RunCMake code path order
6fd7e8c53f Tests: Make RunCMake.Generator{Platform,Toolset} two-flag cases explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5892
2021-03-10 11:21:54 -05:00
Ben Boeckel 088444211e file: add COPY_FILE subcommand
The `file(COPY)` subcommand is overloaded and busy for such a simple
operation. Instead, make a simpler subcommand with error handling
support.
2021-03-10 10:43:18 -05:00
Brad King 00ecddd9eb Tests: Enable Framework test case with spaces everywhere possible 2021-03-10 10:04:05 -05:00
Brad King b6cc9be009 Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quoting 2021-03-10 10:03:36 -05:00
Brad King 4f9a71974e Xcode: Restore support for spaces in framework names
In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument
in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path
to a framework into the directory and framework name parts, but only
retained the quoting on the directory part.  Restore quoting of the
framework name.

Fixes: #21910
2021-03-10 10:01:11 -05:00
Kitware Robot bef1cc77ef CMake Nightly Date Stamp 2021-03-10 00:01:13 -05:00
Craig Scott 57d442e182 Revert ExternalProject and FetchContent refactoring
Refactoring of the ExternalProject and FetchContent modules moved
the commands into CMake scripts. This broke custom commands that
used shell redirection or special build tool variables of the form
$(MakeVar). Undo the sequence of commits that performed this
refactoring and follow-up fixes associated with it.

The following commits are reverted by this change:

4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support
no-target uses, 2021-02-05)

17e5516e60 (FetchContent: Invoke steps directly and avoid a separate
sub-build, 2021-01-29)

bd876f3849 (FetchContent: Restore patch command support,
2021-02-18)

404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in
timestamp checks, 2021-02-21)

b0da671243 (FetchContent: Don't update timestamps if files don't
change, 2021-02-18)

Fixes: #21892
2021-03-10 09:07:44 +11:00
Robert Maynard 400536c317 cmCommandLineArgument: trim leading empty spaces 2021-03-09 14:35:49 -05:00
Robert Maynard b227a9565e cmake: configure preset add support for --install-prefix mapping 2021-03-09 13:53:16 -05:00
Silvio Traversaro 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR
In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray
libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed
the imported target to contain optional libraries only if they are
found.  Do the same for `Matlab_LIBRARIES`.
2021-03-09 12:56:08 -05:00
Kyle Edwards 9af6e2e7b2 Ninja: Use new wincodepage tool to determine encoding
Ninja 1.11 and later uses UTF-8 on Windows when possible, and
includes a tool that reports the code page in use. Use this tool
to determine what encoding to write the Ninja files in.

Fixes: #21866
2021-03-09 11:09:24 -05:00
Ben Boeckel 100016e9cb cmSystemTools: add utilities to copy a file with error handling 2021-03-09 09:47:26 -05:00
Brad King 7b0ab0439d Tests: Fix FortranModules test with Intel compiler on Windows
The test regularly fails updating the `vc*.pdb` compiler-generated
PDB file.  Add the `/Z7` flag as the compiler suggests for this.
2021-03-09 09:22:32 -05:00
Brad King b5f60c54d0 Merge topic 'update-kwsys'
4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys
9e556829c8 KWSys 2021-03-08 (5bfba5e1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5890
2021-03-09 09:18:20 -05:00
Brad King d03732bc65 Merge topic 'soname-spaces'
7621861f30 Tests: Update LibName to cover spaces in shared library name
388eb83c09 Tests: Enable MAKE_SUPPORTS_SPACES tests with Ninja generators
c0a3317497 Ninja: Escape SONAME on linker command line
9dfa7981d5 Makefiles: Escape SONAME on linker command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5880
2021-03-09 09:17:43 -05:00
Brad King a62a30d06b Merge branch 'release-3.20' 2021-03-09 09:16:28 -05:00
Brad King 791338359f Merge branch 'release-3.19' into release-3.20 2021-03-09 09:16:21 -05:00
Brad King e6815336f0 Merge branch 'release-3.20' 2021-03-09 09:15:43 -05:00