| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
|
|/
|
|
|
|
| |
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.
|
|\ |
|
| | |
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | | |
Merge-request: !5903
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
30c835428f VS: Accept and translate '-T version=' values with three components
58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9
09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5903
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The VS 16.8 and VS 16.9 toolset versions differ only in their third
component. The `vcvarsall` option `-vcvars_ver=` accepts a three
component version, so accept this format for VS toolset selection too.
Issue: #21922
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
CMake accepts the toolset version that is default in the current VS
version by matching the name later VS versions will use for the SxS
props files. It predicts the future name based on the first two
components of the current VS version's default toolset. However, this
heuristic breaks naming the VS 16.8 toolset version 14.28 under VS 16.9
because the latter's default toolset version is 14.28.29910, which did
not increment the second version component (unprecedented in VS).
Fix this by always using the requested version's SxS props file when it
exists, even if it matches the first two components of the current VS
version's default toolset. Also add a special case for the name VS
16.10 will use for VS 16.9's default toolset, so that it can be used
with VS 16.9 too.
Fixes: #21922
|
| |/ |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|/ /
| |
| |
| |
| |
| | |
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.
|
| | |
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | | |
Merge-request: !5897
|
| |\ \
| | | |
| | | |
| | | | |
Merge-request: !5899
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4f9a71974e Xcode: Restore support for spaces in framework names
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5899
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5897
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
57d442e182 Revert ExternalProject and FetchContent refactoring
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5898
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5896
|
|/ /
| |
| |
| |
| |
| |
| | |
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`.
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | | |
Merge-request: !5889
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5889
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The justification in commit 9ee4a42813 (Cray: Fix Cray compiler
detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection
of the CrayPrgEnv with identification of the Cray compiler. The
change regressed detection of the CrayPrgEnv on non-Cray compilers.
Revert it pending further investigation into the original problem.
Fixes: #21894
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5882
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Cray 11.0 adds support for preprocessing with output written to a
specified file (instead of always next to the source). Use it to
enable Cray Fortran with the Ninja generator.
Patch-by: James Elliott
Fixes: #20731
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
9ec50ff157 cmake-gui: Restore search bar case insensitivity
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5878
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since these changes:
* commit f1de6f6682 (cmake-gui: Support building against Qt6,
2020-12-17, v3.20.0-rc1~205^2~7)
* commit 134d69121e (cmake-gui: Restore search bar for cache view and
environment dialog, 2021-02-22, v3.20.0-rc2~12^2)
the search bar is no longer case insensitive when using Qt 5.12.[0-1],
and possibly some later versions. It works as of Qt 5.15 though, so
update our version check accordingly.
Fixes: #21884
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
|
| | |
| | |
| | |
| | | |
Fixes: #21772
|
| | |
| | |
| | |
| | |
| | | |
Use `CMAKE_ANDROID_NDK_VERSION` to check for files expected based
on the version of the NDK.
|
| | | |
|
| | |
| | |
| | |
| | | |
Report it in `CMAKE_ANDROID_NDK_VERSION`.
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
e5698605d7 gitlab-ci: ignore failing tests for external IDE testing
beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs
18d6737e96 gitlab-ci: always upload test and release artifacts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5871
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
1bd8f19453 CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flags
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5874
|
|/ / / /
| | | |
| | | |
| | | | |
Need to quote the list expansion otherwise we'll try each argument separately.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
fb4b2ed0d3 FindOpenGL: handle GLX without GLVND
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5861
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On Ubuntu, installing `libgl-dev` provides `libGL` and `libGLX`, but no
`libOpenGL`. Avoid defining GLVND targets without the `OpenGL::OpenGL`
target.
|
|\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
74c2ade187 Help/guide: fix the remaining CMake install destinations
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5870
|
| |/ / /
| | | |
| | | |
| | | | |
Followup from !5674.
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
bdc40742bd CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5863
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
If we REQUIRE_SUCCESS, i.e. TEST_FLAGS_FIRST must work, we need to also try
without user flags.
Fixes #21869.
|