mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,833 Commits 2 Branches 401 Tags
306db0fdb80ad59127372bad51f44b86e43d3120
Commit Graph

30610 Commits

Author SHA1 Message Date
Kitware Robot 0eb42defc2 CMake Nightly Date Stamp 2021-04-27 00:01:07 -04:00
Brad King 395e1d458e Merge topic 'xcode_app_extensions' 
eb5e33ba47 Xcode: Add support for embedding app extensions
f62a2bf44f Tests: Factor out XcodeProject-Embed check function findAttribute()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5934
 2021-04-26 11:34:38 -04:00
Brad King 3c1655936f Merge topic 'lzma-threads' 
c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count
5380d858ff liblzma: Enable multi threaded stream encoding support
e9065e96dc Merge branch 'upstream-liblzma' into lzma-threads
ee909a8e8b liblzma 2020-03-17 (2327a461)
741b85b42b liblzma: Revise update script to get version 5.2.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6014
 2021-04-26 11:33:49 -04:00
Brad King e69a328725 Merge topic 'autogen-moc-version' 
5b0ea5874a AutoGen: Retrieve Qt version from moc as fallback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6027
 2021-04-26 11:31:54 -04:00
Brad King 6aabf2790c Merge topic 'file-REAL_PATH-EXPAND_TILDE' 
e4b793c614 file(REAL_PATH): add option EXPAND_TILDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6033
 2021-04-26 11:30:57 -04:00
Brad King fcafd30a5e Merge topic 'ninja-multi-custom-target-post-build' 
f8e2a74712 Ninja Multi-Config: Correctly generate POST_BUILD custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6040
 2021-04-26 11:25:46 -04:00
Kitware Robot eeb771e4d6 CMake Nightly Date Stamp 2021-04-26 00:01:07 -04:00
Kitware Robot 5f90a93fd7 CMake Nightly Date Stamp 2021-04-25 00:01:06 -04:00
Kitware Robot 88f5d4b24f CMake Nightly Date Stamp 2021-04-24 00:01:09 -04:00
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
Kitware Robot 15a148dec6 CMake Nightly Date Stamp 2021-04-23 00:01:09 -04:00
Kyle Edwards f8e2a74712 Ninja Multi-Config: Correctly generate POST_BUILD custom targets 
Fixes: #22096
 2021-04-22 15:51:53 -04:00
Nils Gladitz c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count 
Merge use of SetFilterOption() into more abstract thread count
in cmArchiveWrite constructor.

libarchive defaulting of threads for threads == 0 seems to be
configuration dependent. Preemptively default thread count via
std::thread::hardware_concurrency().

Also allow negative values for the thread count in which case
the detected hardware concurrency is also used but the given
absolute thread count is used as an upper limit.
 2021-04-22 15:40:13 -04:00
Alexander Akhundzhanov eb5e33ba47 Xcode: Add support for embedding app extensions 
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2021-04-22 15:17:02 +10:00
Kitware Robot 86b2457e92 CMake Nightly Date Stamp 2021-04-22 00:01:07 -04:00
Marc Chevrier e4b793c614 file(REAL_PATH): add option EXPAND_TILDE 
This option enables the replacement of any leading tilde with the path
to the user's home directory.
 2021-04-22 08:08:47 +10:00
Brad King 02fbe4083c Merge topic 'cmake-timestamp-error' 
835896e985 cmake: Improve error message when failing to update generation timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6021
 2021-04-21 10:46:18 -04:00
Brad King 835896e985 cmake: Improve error message when failing to update generation timestamp 
Include the underlying system error description.

Issue: #21571, #22086
 2021-04-21 10:45:16 -04:00
Brad King c44066f3b0 Merge topic 'nvhpc-warnings' 
46d4c8e4df CTestCustom: Ignore warning from FD_ZERO macro on NVHPC
408e6d6185 Utilities: Suppress warnings in third-party code with NVHPC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6019
 2021-04-21 10:43:33 -04:00
Brad King 5a8b37e53b Merge topic 'autogen-clear-early-source-cache' 
b84f1e6159 Autogen: Restore mocs_compilation in OBJECT libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6024
 2021-04-21 10:42:17 -04:00
Kitware Robot 57872e6d44 CMake Nightly Date Stamp 2021-04-21 00:01:08 -04:00
Brad King b84f1e6159 Autogen: Restore mocs_compilation in OBJECT libraries 
Since commit f65f20938c (Autogen: Avoid processing CSharp targets,
2020-11-12, v3.20.0-rc1~301^2) we collect all sources for a target
earlier than previously.  Clear the sources cache so that it will be
re-computed later after AUTOGEN processing.

Fixes: #22085
 2021-04-20 16:04:08 -04:00
Brad King 408e6d6185 Utilities: Suppress warnings in third-party code with NVHPC 2021-04-20 11:44:25 -04: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
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
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
Kitware Robot d46170970b CMake Nightly Date Stamp 2021-04-18 00:01:04 -04: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 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 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
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
Robert Maynard d5c3e4ac32 cmake: add support for --toolchain command argument 2021-04-15 10:13:49 -04:00
Kitware Robot 498b916cdd CMake Nightly Date Stamp 2021-04-15 00:04:10 -04:00
Brad King 3ef5dab010 cmSystemTools: Simplify using KWSys Status 2021-04-14 13:14:29 -04:00
Brad King ec1b6157cb Update CMake code using KWSys to account for Status return values 
KWSys as of 2021-04-14 changed the return type of `SystemTools`
operations from `bool` to `Status`.  Update our call sites.
This may improve error reporting accuracy in a few places.
 2021-04-14 13:14:09 -04:00
Brad King eef585efaa Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-14 (7ab1c601)
 2021-04-14 12:13:59 -04:00