mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-12 18:19:11 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,901 Commits 2 Branches 390 Tags
3dd776ccfdd52271dc32db2b7495ec3c7449aa22
Commit Graph

30640 Commits

Author SHA1 Message Date
Brad King
4419b944fd Merge topic 'ninja-multi-long-command-line-config' 
ad08f93ee4 Ninja Multi-Config: Split long command lines by config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6067
 2021-05-03 10:53:50 -04:00
Brad King
4df3f5300a Merge topic 'foreach-loop-variable' 
46896d98bb foreach(): loop variables are only available in the loop scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6044
 2021-05-03 09:59:35 -04:00
Brad King
ec6ba9a3b8 Merge topic 'update-kwsys' 
11cadc3ef7 Merge branch 'upstream-KWSys' into update-kwsys
18513fa118 KWSys 2021-04-29 (5655d533)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6063
 2021-05-03 09:58:49 -04:00
Kitware Robot
8095cdd8c0 CMake Nightly Date Stamp 2021-05-03 00:01:14 -04:00
Kitware Robot
4f88cb1675 CMake Nightly Date Stamp 2021-05-02 00:01:06 -04:00
Kitware Robot
a51ad60687 CMake Nightly Date Stamp 2021-05-01 00:01:06 -04:00
Kyle Edwards
ad08f93ee4 Ninja Multi-Config: Split long command lines by config 
Fixes: #22123
 2021-04-30 14:46:21 -04:00
Kitware Robot
4b60072620 CMake Nightly Date Stamp 2021-04-30 00:01:09 -04:00
Brad King
1ad4501ae9 CMake 3.20.2 2021-04-29 09:53:54 -04:00
Brad King
11cadc3ef7 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-29 (5655d533)
 2021-04-29 09:45:42 -04:00
Brad King
e2ac92681c Merge topic 'nvhpc-warnings' 
f881b4e4cc cmCPackDebGenerator: Remove unused local variable
5ad8862318 Source: Convince NVHPC that RAII variables are used
1898f9dd82 cmFileCommand: Remove unused local variable
6a003c6f35 cmSystemTools: Avoid unreachable code warning on NVHPC
16275c7f82 LexerParser: Suppress NVHPC warnings in generated code
cefda16d35 LexerParser: Regenerate parsers with bison 3.7.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6049
 2021-04-29 09:21:37 -04:00
Brad King
de76de9606 Merge topic 'vs-VCTargetsPath-Platform' 
3db61cf985 VS: Fix VCTargetsPath detection when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6053
 2021-04-29 09:17:14 -04:00
Kitware Robot
60288129db CMake Nightly Date Stamp 2021-04-29 00:04:13 -04:00
Marc Chevrier
46896d98bb foreach(): loop variables are only available in the loop scope 
Fixes: #20553
 2021-04-28 19:44:25 +02:00
Brad King
f881b4e4cc cmCPackDebGenerator: Remove unused local variable 2021-04-28 10:09:52 -04:00
Brad King
5ad8862318 Source: Convince NVHPC that RAII variables are used 2021-04-28 10:09:52 -04:00
Brad King
1898f9dd82 cmFileCommand: Remove unused local variable 2021-04-28 10:09:52 -04:00
Brad King
6a003c6f35 cmSystemTools: Avoid unreachable code warning on NVHPC 2021-04-28 10:09:52 -04:00
Brad King
16275c7f82 LexerParser: Suppress NVHPC warnings in generated code 2021-04-28 10:09:35 -04:00
Brad King
cefda16d35 LexerParser: Regenerate parsers with bison 3.7.5 2021-04-28 10:08:22 -04:00
Brad King
11530e5504 Merge topic 'ARMClang-cpu-arch-flags' 
c4941b7e66 ARMClang: Do not automatically add cpu/arch compile or link options
0078db3888 ARMClang: Separate cpu/arch flags from preceding flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jaeden Amero <kitware@patater.com>
Merge-request: !6035
 2021-04-28 09:49:41 -04:00
Kitware Robot
857373c53c CMake Nightly Date Stamp 2021-04-28 00:01:11 -04:00
Brad King
3db61cf985 VS: Fix VCTargetsPath detection when cross-compiling 
Tell `MSBuild` to use the same `Platform` that we generate into the
`VCTargetsPath` detection project.

Fixes: #22068
 2021-04-27 14:39:10 -04:00
Lingkai Dong
c4941b7e66 ARMClang: Do not automatically add cpu/arch compile or link options 
The compile options `--march=<arch>` and `--mcpu=<cpu>` and the
link option `--cpu=<cpu>` are automatically added by CMake based
on `CMAKE_SYSTEM_PROCESSOR` or `CMAKE_SYSTEM_ARCH`. But this is not
sufficient, because armclang also supports enabling or disabling
features using `+<feature>`:

    -mcpu=<name>[+[no]<feature>+...]

For example:

    -mcpu=cortex-a57+nocrypto+nofp+nosimd+crc

(Reference: https://developer.arm.com/documentation/dui0774/k/Compiler-Command-line-Options/-mcpu?lang=en)

The problem is, even if a project adds a flag with features it needs,
CMake still adds flags, resulting in code that is compiled with wrong
CPU features and unable to run.

Add policy `CMP0123` to not automatically add compile or link options,
and let projects set them instead.

Co-Author: Brad King <brad.king@kitware.com>
Fixes: #21173
 2021-04-27 14:03:15 -04:00
Brad King
970f175d88 Merge topic 'ctest_junit' 
25bf514447 ctest: Add support for writing test results in JUnit XML format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Acked-by: MvdHurk <maikelvandenhurk@hotmail.com>
Acked-by: Alexander Richardson <arichardson.kde@gmail.com>
Merge-request: !6020
 2021-04-27 13:53:55 -04:00
Brad King
20b2bf0047 Merge topic 'update-kwsys' 
e57c4116ac Merge branch 'upstream-KWSys' into update-kwsys
1ba07ff0f8 KWSys 2021-04-26 (642ddfcc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6047
 2021-04-27 13:52:17 -04:00
Brad King
893a5108c5 Merge topic 'msys-simple' 
231df230d5 Help: Add release note for MSYS runtime support
ddcd1469e8 MSYS: Add support for running under MSYS runtime environment
b3ca4f9ad1 cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtime
c9aec3d4a9 FindCurses: Do not assume ncurses is installed on CYGWIN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5969
 2021-04-27 13:50:09 -04:00
Kitware Robot
0eb42defc2 CMake Nightly Date Stamp 2021-04-27 00:01:07 -04:00
Orgad Shaneh
ddcd1469e8 MSYS: Add support for running under MSYS runtime environment 
Detect MSYS as CYGWIN, with the required adaptations.
 2021-04-26 14:27:34 -04:00
Brad King
e57c4116ac Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-26 (642ddfcc)
 2021-04-26 14:05:49 -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
Zack Galbreath
25bf514447 ctest: Add support for writing test results in JUnit XML format 
Addresses #18654
 2021-04-26 08:55:22 -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