1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Commit Graph

52764 Commits

Author SHA1 Message Date
Joerg Bornemann
5b0ea5874a AutoGen: Retrieve Qt version from moc as fallback
Consider the case where the find_package call for QtCore is wrapped in a
function call. Then AutoGen cannot determine the Qt version, because it
only looks at variables and directory properties. The former don't leave
the function scope and the latter are not set by default.

As a fallback, locate the moc executable via its target and call it with
the --version argument to determine the Qt version.

Issue: #22028
2021-04-23 10:49:07 +02:00
Brad King
63ffe21036 Merge topic 'update-kwsys'
b5cb26e287 Merge branch 'upstream-KWSys' into update-kwsys
d98342d868 KWSys 2021-04-19 (d6139c66)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6018
2021-04-20 10:00:33 -04:00
Brad King
4c0d69e813 Merge topic 'Xcode-add_custom_command-DEPFILE'
253aff6c94 Xcode: Add support of DEPFILE for add_custom_command, part 2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6015
2021-04-20 09:59:53 -04:00
Brad King
6d30975a9e Merge branch 'release-3.20' 2021-04-20 09:58:53 -04:00
Brad King
c6fa8cd3f2 Merge topic 'doc-if-IS_ABSOLUTE'
6234afdff4 Help: Document special cases for if(IS_ABSOLUTE)
789307b02f Help: Behavior of file(TO_NATIVE_PATH) depends on the host platform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6016
2021-04-20 09:58:53 -04:00
Brad King
b0be93c5c7 Merge topic 'doc-if-IS_ABSOLUTE' into release-3.20
6234afdff4 Help: Document special cases for if(IS_ABSOLUTE)
789307b02f Help: Behavior of file(TO_NATIVE_PATH) depends on the host platform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6016
2021-04-20 09:58:51 -04:00
Kitware Robot
e1896d9c54 CMake Nightly Date Stamp 2021-04-20 00:01:09 -04:00
Brad King
b5cb26e287 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-19 (d6139c66)
2021-04-19 09:46:56 -04:00
KWSys Upstream
d98342d868 KWSys 2021-04-19 (d6139c66)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit d6139c66c8760552ab6bc4a08401ae8105217469 (master).

Upstream Shortlog
-----------------

Orgad Shaneh (3):
      17f4af9b SystemTools: Use octal base for error messages in permission test
      f00dd83e SystemTools: Avoid unnecessary assumption of working directory in test case
      5b941f33 SystemTools: Adapt permissions test to MSYS
2021-04-19 09:46:55 -04:00
Brad King
995be1097c Merge topic 'tests-clang-analyzer'
ae2c24b0ba Tests: Fix warning clang-analyzer-cplusplus.NewDeleteLeaks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6010
2021-04-19 09:45:40 -04:00
Brad King
0c5ac41dbb Merge branch 'release-3.20' 2021-04-19 09:44:51 -04:00
Brad King
f6ea1b59e1 Merge topic 'cxxprefix'
4c741d945a BinUtils: Restore toolchain prefix detection from compiler name 'c++'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !6011
2021-04-19 09:44:51 -04:00
Brad King
dc7871739f Merge topic 'cxxprefix' into release-3.20
4c741d945a BinUtils: Restore toolchain prefix detection from compiler name 'c++'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !6011
2021-04-19 09:44:50 -04:00
Brad King
9619dd3a5b Merge branch 'release-3.20' 2021-04-19 09:44:03 -04:00
Brad King
5ac713da70 Merge topic 'mrjoel/add-missing-not'
370bebd921 Add missing 'not' in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6012
2021-04-19 09:44:03 -04:00
Brad King
a2372f64b4 Merge topic 'mrjoel/add-missing-not' into release-3.20
370bebd921 Add missing 'not' in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6012
2021-04-19 09:44:02 -04:00
Kitware Robot
42bede8385 CMake Nightly Date Stamp 2021-04-19 00:01:15 -04:00
Craig Scott
f560d16458 Merge topic 'fix-typo-toolchain_file'
388c347a4b Help: Fix typo in CMAKE_TOOLCHAIN_FILE docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6017
2021-04-18 17:39:24 -04:00
Kitware Robot
d46170970b CMake Nightly Date Stamp 2021-04-18 00:01:04 -04:00
Albrecht Schlosser
388c347a4b Help: Fix typo in CMAKE_TOOLCHAIN_FILE docs 2021-04-18 07:52:59 +10:00
Craig Scott
6234afdff4 Help: Document special cases for if(IS_ABSOLUTE)
The meaning of "absolute path" was previously assumed knowledge,
but a number of special cases were left unspecified. The way some of
these are handled differs to the way that cmake_path(IS_ABSOLUTE)
works, so document those special cases so that the differing behavior
between these two commands is clearly defined.
2021-04-17 19:41:53 +10:00
Craig Scott
789307b02f Help: Behavior of file(TO_NATIVE_PATH) depends on the host platform 2021-04-17 19:41:53 +10:00
Marc Chevrier
253aff6c94 Xcode: Add support of DEPFILE for add_custom_command, part 2
This MR extend the support of 'DEPFILE' to buildsystem version 1.

Issue: #20286
2021-04-17 11:05:26 +02:00
Kitware Robot
94fb2516f0 CMake Nightly Date Stamp 2021-04-17 00:01:08 -04:00
Brad King
ffb85e2014 Merge branch 'release-3.20' 2021-04-16 13:24:05 -04:00
Brad King
19a59399e4 Merge topic 'ci-lint-delay'
661ff7f2d8 gitlab-ci: equally delay all jobs on integration branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6013
2021-04-16 13:24:05 -04:00
Brad King
afba2709f7 Merge topic 'ci-lint-delay' into release-3.20
661ff7f2d8 gitlab-ci: equally delay all jobs on integration branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6013
2021-04-16 13:24:04 -04:00
Brad King
661ff7f2d8 gitlab-ci: equally delay all jobs on integration branches
When running a pipeline on an integration branch in `cmake/cmake`, delay
the lint jobs just as much as all the others.  This avoids starting them
unnecessarily during a sequence of merges over a short time range.
2021-04-16 12:15:15 -04:00
nic-kaczinsky
ae2c24b0ba Tests: Fix warning clang-analyzer-cplusplus.NewDeleteLeaks
Fix the warning: `potential leak of memory pointed to by "vp"`.
2021-04-16 11:49:51 -04:00
Brad King
acace43852 Merge topic 'Xcode-add_custom_command-DEPFILE'
d67cc4882d Xcode: Add support of DEPFILE for add_custom_command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6006
2021-04-16 11:42:23 -04:00
Brad King
09dee5f9ba Merge topic 'report-system-error'
c2d2772f15 try_compile: Improve error message when a file cannot be removed
79a2f1e22a cmcmd: Improve error message from cmake_symlink_{library,executable}
7f89053953 cmSystemTools: Return KWSys Status from CreateLink and CreateSymlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6007
2021-04-16 11:40:24 -04:00
Brad King
bb290fc7a4 Merge topic 'add_toolchain_cmake_option'
d5c3e4ac32 cmake: add support for --toolchain command argument
13838bbb36 CMAKE_TOOLCHAIN_FILE: Document relative path behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5991
2021-04-16 11:39:28 -04:00
Brad King
16f213efa3 Merge topic 'fujitsu-fixup'
cc0d2004b2 Fujitsu: Fix C90 standard flags
ec78e86cc8 FujitsuClang: Use GNU-like command-line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5997
2021-04-16 11:38:40 -04:00
Brad King
06fbbfb17d Merge branch 'release-3.20' 2021-04-16 11:35:48 -04:00
Brad King
e9da93e066 Merge topic 'depfile-reader-thread-safety' into release-3.20
53d523f2e1 autogen: fix race in depfile parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6008
2021-04-16 11:35:47 -04:00
Brad King
d00ddb9761 Merge topic 'depfile-reader-thread-safety'
53d523f2e1 autogen: fix race in depfile parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6008
2021-04-16 11:35:47 -04:00
Joel Johnson
370bebd921 Add missing 'not' in error messages 2021-04-16 07:47:59 -06:00
Lihua Zhao
4c741d945a BinUtils: Restore toolchain prefix detection from compiler name 'c++'
Since commit b12aec6c8d (BinUtils: prefer bin utils matching the
compiler version extension, 2020-12-11, v3.20.0-rc1~171^2) we recognize
`clangg++` and `g++` but not `c++`.  Restore `[gc]` in place of `g`
in the regex, as we had before that change.

Fixes: #22069
2021-04-16 09:20:16 -04:00
Kitware Robot
e5a098968c CMake Nightly Date Stamp 2021-04-16 00:01:04 -04:00
Kyle Edwards
53d523f2e1 autogen: fix race in depfile parsing
cmReadGccDepfile() calls cmSystemTools::CollapseFullPath(), which
is not thread safe due to internal caching. Serialize calls to
cmReadGccDepfile() in autogen to avoid thread safety issues.

Fixes: #22014
2021-04-15 15:25:38 -04:00
Brad King
c2d2772f15 try_compile: Improve error message when a file cannot be removed 2021-04-15 12:40:37 -04:00
Brad King
79a2f1e22a cmcmd: Improve error message from cmake_symlink_{library,executable} 2021-04-15 12:40:37 -04:00
Brad King
7f89053953 cmSystemTools: Return KWSys Status from CreateLink and CreateSymlink 2021-04-15 12:40:37 -04:00
Marc Chevrier
d67cc4882d Xcode: Add support of DEPFILE for add_custom_command
Issue: #20286
2021-04-15 12:17:31 -04:00
Brad King
27b5dc35a6 Merge topic 'update-kwsys'
3ef5dab010 cmSystemTools: Simplify using KWSys Status
ec1b6157cb Update CMake code using KWSys to account for Status return values
eef585efaa Merge branch 'upstream-KWSys' into update-kwsys
a790167101 KWSys 2021-04-14 (7ab1c601)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6004
2021-04-15 11:11:17 -04:00
Brad King
b65912006e Merge topic 'FindBLAS-FindLAPACK'
dcd604ee62 Find{BLAS,LAPACK}: Make library variable names more robust
98ef6632d9 Find{BLAS,LAPACK}: Generalize recognition of dependencies as link flags
a57c4eef76 Find{BLAS,LAPACK}: Convert internal CHECK_*_LIBRARIES to functions
a5a6ac7033 Find{BLAS,LAPACK}: Clarify name of internal argument for dependencies
d248401d12 Find{BLAS,LAPACK}: Simplify appending to list of libraries
e4649d1d15 Find{BLAS,LAPACK}: Add test case covering Intel MKL
116edb5c04 Find{BLAS,LAPACK}: Revert bad refactoring of internal CHECK_*_LIBRARIES
44bcec240b ci: factor out Intel Compiler common configure script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6005
2021-04-15 11:10:19 -04:00
Brad King
81d796e3f2 Merge topic 'doc-error-unknown-arg' into release-3.20
06d26c7baf Help: Add 3.20 release note for error on unknown arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6003
2021-04-15 11:07:33 -04:00
Brad King
c7edf43206 Merge branch 'release-3.20' 2021-04-15 11:07:33 -04:00
Brad King
2f30ee24d3 Merge topic 'doc-error-unknown-arg'
06d26c7baf Help: Add 3.20 release note for error on unknown arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6003
2021-04-15 11:07:33 -04:00
Robert Maynard
d5c3e4ac32 cmake: add support for --toolchain command argument 2021-04-15 10:13:49 -04:00