mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-25 15:49:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,062 Commits 2 Branches 401 Tags
f6d4fa63f84a88dbc59020b10fbdb7fb02fa1f9d
Commit Graph

53062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King f6d4fa63f8 cmStateDirectory: Comment relative path top directory selection approach 2021-05-13 12:48:43 -04:00
Brad King f0ffb1e2d4 cmGlobalGenerator: Simplify relative path conversion in AddRuleHash 
Revert commit 204aecdf82 (cmGlobalGenerator: Port configure-time code to
cmMakefile., 2015-08-02, v3.4.0-rc1~234^2~8).  `AddRuleHash` is
generate-time code.
 2021-05-13 12:48:43 -04:00
Brad King d346805e41 cmLocalCommonGenerator: Select work directory semantically 2021-05-13 12:48:22 -04:00
Brad King 15fa320071 cmLocalGenerator: Factor out relative path conversion helpers 
Most calls to `MaybeConvertToRelativePath` use one of our common work
directories (e.g. top of the build tree) as the local path.  Add helpers
for each of the common cases to simplify and clarify call sites.
 2021-05-13 12:47:25 -04:00
Brad King 1879f1bcbc cmLocalCommonGenerator: Factor out relative path conversion helper 2021-05-13 12:47:25 -04:00
Brad King 1d1d88d3c8 cmMakefileTargetGenerator: Clarify name of relative path conversion helper 2021-05-13 12:47:25 -04:00
Brad King ec1ea13066 cmDependsFortran: Simplify relative path conversion helper 
Revert commit 8377d9e00b (Fortran: Inline conversion to relative path,
2016-10-04, v3.8.0-rc1~494^2~4).  The inline implementation is still
identical to what was previously called.  Restore the call again.
 2021-05-13 12:46:26 -04:00
Brad King ba7b939831 cmStateDirectory: Rename ConvertToRelPathIf{Not => }Contained 
The "Not" in the method name is backward from its logic.
 2021-05-12 15:53:37 -04:00
Brad King 09bee3bee1 cmGlobalGhsMultiGenerator: Simplify relative path conversion logic 
Our call to `MaybeConvertToRelativePath` uses paths that always pass the
"maybe" checks.  Use `ForceToRelativePath` directly.
 2021-05-12 15:53:26 -04:00
Brad King f69079577a cmGlobalXCodeGenerator: Simplify relative path conversion under project root 2021-05-12 15:43:58 -04:00
Brad King 169d998bb8 Merge topic 'ci-codespell' 
bca69d4272 gitlab-ci: add codespell lint job
bf35f3848a gitlab-ci: rename lint builds to start in lint:
f89c1a559d UseJava: Avoid non-word "compilability" in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6118
 2021-05-12 09:19:53 -04:00
Brad King bca69d4272 gitlab-ci: add codespell lint job 2021-05-12 07:35:16 -04:00
Brad King bf35f3848a gitlab-ci: rename lint builds to start in lint: 2021-05-12 07:35:16 -04:00
Brad King f89c1a559d UseJava: Avoid non-word "compilability" in documentation 
Also fix spelling in the release note from commit 3e03f359a7 (UseJava:
Add RESOURCES with NAMESPACE to add_jar(), 2021-04-27).
 2021-05-12 07:35:16 -04:00
Brad King ce19e38151 Merge topic 'xcode-inherited-params' 
dfaf55fbfd Xcode: add extra '$(inherited)' entries using InheritBuildSettingAttribute.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6077
 2021-05-12 07:27:00 -04:00
Brad King 228764d69e Merge topic 'misc-improve' 
5e8fa0b7bc Source: Minor code improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6116
 2021-05-12 07:25:33 -04:00
Brad King bfb6873042 Merge topic 'ci-fedora34' 
18bd63af41 ci: enable FindProtobuf gRPC test on Linux builds
27adb6c78e gitlab-ci: update Debian base images
89478e643f gitlab-ci: update to Fedora 34 base images
6ff48b862c ci: add gRPC to Debian and Fedora base images
4ad8bfcd9b ci: add codespell to Fedora base image
fa261d1b7d ci: add Qt 6 to Fedora base image
82fc490f93 ci: update to Fedora 34 for Linux base images
a69e6dba92 gitlab-ci: update to Fedora 34 for upload jobs
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6117
 2021-05-12 07:23:51 -04:00
Brad King 18bd63af41 ci: enable FindProtobuf gRPC test on Linux builds 2021-05-12 07:17:54 -04:00
Brad King 27adb6c78e gitlab-ci: update Debian base images 2021-05-12 07:17:54 -04:00
Brad King 89478e643f gitlab-ci: update to Fedora 34 base images 2021-05-12 07:17:54 -04:00
Brad King 6ff48b862c ci: add gRPC to Debian and Fedora base images 2021-05-12 07:17:54 -04:00
Brad King 4ad8bfcd9b ci: add codespell to Fedora base image 2021-05-12 07:17:54 -04:00
Brad King fa261d1b7d ci: add Qt 6 to Fedora base image 2021-05-12 07:17:54 -04:00
Brad King 82fc490f93 ci: update to Fedora 34 for Linux base images 2021-05-12 07:17:54 -04:00
Brad King a69e6dba92 gitlab-ci: update to Fedora 34 for upload jobs 
Also add 'cmake' tag to match the rest of our jobs.
 2021-05-12 07:17:35 -04:00
Kitware Robot 1c7c155366 CMake Nightly Date Stamp 2021-05-12 00:01:11 -04:00
Brad King 40c672aaeb clang-tidy: ignore readability-function-cognitive-complexity 2021-05-11 15:08:08 -04:00
Brad King 4281cd15db clang-tidy: fix bugprone-redundant-branch-condition 2021-05-11 15:08:08 -04:00
Vitaly Stakhovsky 5e8fa0b7bc Source: Minor code improvements 2021-05-11 11:20:04 -04:00
Brad King ee87e53d37 Merge topic 'windows-artifact-symlinks' 
d0c31cbff9 Windows: Use real artifact versioning symlinks if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6093
 2021-05-11 09:28:49 -04:00
Brad King 553cd4db44 Merge topic 'fixAppleResourceWarning' 
169da7cd81 Do not show RESOURCE DESTINATION warning for MACOSX_BUNDLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6104
 2021-05-11 09:27:45 -04:00
Brad King a94332ed37 Merge topic 'cmprop-nullptr' 
ce97b7909b Source: Remove unnecessary comparisons to nullptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6112
 2021-05-11 09:26:39 -04:00
Brad King 6c5a2b2171 Merge topic 'helpctestscript' 
140fe8c3c6 Help: Document CTEST_SCRIPT_DIRECTORY variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6111
 2021-05-11 09:25:53 -04:00
Brad King 9b2b91abe7 Merge topic 'UseJava-add_jar-resource-namespace' 
3e03f359a7 UseJava: Add RESOURCES with NAMESPACE to add_jar()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Smit-tay <damnedyankee@gmail.com>
Merge-request: !6071
 2021-05-11 09:24:20 -04:00
Brad King d0b6eb8ec7 Merge topic 'capabilties-generator-platforms' 
66be34853c cmake: add supported platforms to cmake -E capabilties report

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6102
 2021-05-11 09:22:47 -04:00
Brad King ad961fd42a Merge topic 'findlapack_support_nvhpc' 
2c9e623e31 Find{BLAS,LAPACK}: Add support for the NVHPC LAPACK library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6089
 2021-05-11 09:21:50 -04:00
Brad King f727410c8f Merge branch 'release-3.20' 2021-05-11 09:19:12 -04:00
Brad King ca11096fd3 Merge topic 'cpp23_gcc' 
9fbbebe3d0 GNU: C++23 support
c9a1e06a18 GNU: Final C++20 flags
05f8c8178d GNU: C++17 default version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6108
 2021-05-11 09:19:12 -04:00
Brad King 13f813ebe4 Merge topic 'cpp23_gcc' into release-3.20 
9fbbebe3d0 GNU: C++23 support
c9a1e06a18 GNU: Final C++20 flags
05f8c8178d GNU: C++17 default version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6108
 2021-05-11 09:19:11 -04:00
Kitware Robot fdab87312c CMake Nightly Date Stamp 2021-05-11 00:01:09 -04:00
Brad King a77cda587b Merge topic 'build-with-qt6-deprecations' 
6c657173d8 cmake-gui: Address deprecation warnings with Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sankhesh Jhaveri <sankhesh.jhaveri@kitware.com>
Merge-request: !6107
 2021-05-10 12:21:45 -04:00
Vitaly Stakhovsky ce97b7909b Source: Remove unnecessary comparisons to nullptr 2021-05-10 11:44:53 -04:00
Georg Schwab d0c31cbff9 Windows: Use real artifact versioning symlinks if possible 
When cross compiling from Windows to a platform that uses SONAMEs, real
symlinks are now created for the VERSION and SOVERSION links instead of
copies, if the user has the necessary privileges.

Fixes: #22128
 2021-05-10 11:12:28 -04:00
Michael Hirsch 140fe8c3c6 Help: Document CTEST_SCRIPT_DIRECTORY variable 2021-05-10 10:55:59 -04:00
Smit tay 3e03f359a7 UseJava: Add RESOURCES with NAMESPACE to add_jar() 
add_jar() currently requires (undocumented) that resources be supplied
as relative paths.  The resources *may* then end up in a path which does
not reflect the original path particularly when performing out-of-source
builds.  This change adds a RESOURCE (and NAMESPACE) parameter and a
function to add the names resources into the named namespace within the
jar- and thus address both of these problems.

Fixes: #22101
 2021-05-10 10:48:46 -04:00
scheffle 66be34853c cmake: add supported platforms to cmake -E capabilties report 2021-05-10 10:28:28 -04:00
Raul Tambre 9fbbebe3d0 GNU: C++23 support 
Added in GCC commit 78739c2df788ee5c868d998a6333d453317d8711, released in 11.1.
No lettered variant beforehand this time around.

Implements #22139.
 2021-05-10 10:19:13 -04:00
Raul Tambre c9a1e06a18 GNU: Final C++20 flags 
Added in GCC commit fb26050409473f5be54465beca114b7e48de43aa, released in 11.1.
 2021-05-10 10:19:13 -04:00
Raul Tambre 05f8c8178d GNU: C++17 default version 
Changed in GCC commit 0801f419440c14f6772b28f763ad7d40f7f7a580, released in 11.1.
 2021-05-10 10:19:13 -04:00
Brad King 2ee55f9718 Merge topic 'remove-unused-Command-member' 
1aa4f97c97 cmCTestGenericHandler: Remove unused Command member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6106
 2021-05-10 10:15:50 -04:00