| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
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
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
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`.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
9af6e2e7b2 Ninja: Use new wincodepage tool to determine encoding
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5860
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
7b0ab0439d Tests: Fix FortranModules test with Intel compiler on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5894
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The test regularly fails updating the `vc*.pdb` compiler-generated
PDB file. Add the `/Z7` flag as the compiler suggests for this.
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously we only printed explicit `RunCMake_TEST_COMMAND` cases on
failure. Refactor the RunCMake infrastructure so that we always define
`RunCMake_TEST_COMMAND` internally, and print it on failure.
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Do not rely on the RunCMake infrastructure to pass `-T` or `-A`.
|
| | |/ / / /
|/| | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys
9e556829c8 KWSys 2021-03-08 (5bfba5e1)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5890
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
# By KWSys Upstream
* upstream-KWSys:
KWSys 2021-03-08 (5bfba5e1)
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 5bfba5e1a988e16df833e86062d61f4b70d83645 (master).
Upstream Shortlog
-----------------
Ben Boeckel (4):
f69c5cb7 Directory: return a bool literal on Windows
2a118b34 SystemTools: use nullptr in Windows-only code
7ee0dbee Directory: capture the error message
dd703ac6 SystemTools: make file copying mechanisms public
Sean McBride (1):
3ba8a6de Glob: Change deleted ctor and operator= from private to public
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
If the shared object name contains spaces, they need to be properly
escaped, or link command will fail.
This was already done for soname symlink creation in commit 13c92b4a30
(Ninja: Fix creation of library symlinks in folders with spaces,
2019-05-20, v3.15.0-rc1~87^2).
Fixes: #20331
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
If the shared object name contains spaces, they need to be properly
escaped, or link command will fail.
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| | |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merge-request: !5889
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / |
|
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"
Acked-by: Kitware Robot <kwrobot@kitware.com>
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
|
| | |_|_|/ / /
|/| | | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
31be23dd1d ci: Restore the Module.ExternalData test on Windows
fdfbf89f0c ExternalData: Avoid replacing a concurrently-created object
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5883
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In commit a58e3c7e8b (ci: Skip the Module.ExternalData test on Windows,
2020-10-01, v3.19.0-rc1~59^2) the test was dropped pending further
investigation. We've now (hopefully) resolved the underlying problem,
so we can restore the test.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If more than one content link references the same object, the build
system may launch multiple download processes for the same object
concurrently. Use whichever one finishes first, and discard the others.
Without this, we replace the objects and use the last finisher instead
of the first. This is okay on non-Windows platforms where `rename(2)`
gives reliable atomic replacement. However, on Windows platforms and
NTFS this is less reliable. I've observed `MoveFileEx` somehow cause
another process to get `ERROR_SHARING_VIOLATION` when attempting to read
the destination file. We may be able to improve the `file(RENAME)`
implementation on modern Windows 10 versions, but for ExternalData's use
case it is simpler to just not replace existing objects.
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
1b33150f7e cmGlobalVisualStudio10Generator: Generalize flag table lookup interface
414b5e0119 cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name
cbba9f26a8 cmGlobalVisualStudio10Generator: Drop unnecessary temporaries
d5522f096d cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization
99f6f1b3b9 cmGlobalVisualStudio10Generator: Remove redundant arguments
1b774e18fb cmGlobalVisualStudio10Generator: Remove redundant arguments
a1c0758ea0 cmGlobalVisualStudio10Generator: Clarify method name
e562e8987c cmGlobalVisualStudio10Generator: Remove unused flag table method argument
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5884
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The default toolset names are always canonical.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Migrate them from `cmVisualStudio10ToolsetOptions`.
|
