mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,905 Commits 2 Branches 401 Tags
f060e6e556231fde7653d38679ec8d5608bdfc29
Commit Graph

8538 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
Kyle Edwards ad08f93ee4 Ninja Multi-Config: Split long command lines by config 
Fixes: #22123
 2021-04-30 14:46:21 -04:00
Brad King c4f8c82358 Merge topic 'test-ifort-windows' 
82470e24ae Tests: Fix FortranOnly test with Intel compiler on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6058
 2021-04-29 09:20:45 -04:00
Brad King 83d8b358c2 Merge topic 'test-GEH-vs6' 
d59afbd92e Tests: Fix RunCMake.GenerateExportHeader use of size_t

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6059
 2021-04-29 09:19:55 -04:00
Brad King 34f316b484 Merge topic 'test_driver_tap13_support' 
3f6ff4b5db create_test_sourcelist: add test driver option to run all tests
a3aa5596a1 Tests: Isolate TestDriver build directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3661
 2021-04-29 09:19:02 -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 82470e24ae Tests: Fix FortranOnly test with Intel compiler on Windows 
The test regularly fails updating the `vc*.pdb` compiler-generated
PDB file.  Add the `/Z7` flag as the compiler suggests for this.
 2021-04-28 09:55:42 -04:00
Brad King d59afbd92e Tests: Fix RunCMake.GenerateExportHeader use of size_t 
Since commit ddcd1469e8 (MSYS: Add support for running under MSYS
runtime environment, 2021-04-01) the test uses `std::size_t` without
including `<cstddef>`.  Also, the type does not exist under `std::`
on VS 6.  Use just `size_t` instead.
 2021-04-28 09:55:36 -04:00
Sergey Bronnikov 3f6ff4b5db create_test_sourcelist: add test driver option to run all tests 
New option `-A` passed to test binary allows to run all testcases at
once and prints a report in a standard format - TestAnythingProtocol v.13 [1].
Execution of test whose names will be passed after an option will be skipped.

Sample of output:

    TAP version 13
    1..6
    ok 1 TestCryptoHash # 0.030000
    ok 2 TestCryptoRand # 0.008000
    not ok 3 TestCryptoCipher # 0.005000
    ok 4 TestCryptoProtectData # 0.000000
    cbPlainText: 21 cbCipherText: 32
    PlainText: MySecretPassword123! (cbPlainText = 21, cbCipherText = 32)
    Decrypted CipherText: MySecretPassword123!
    ok 5 TestCryptoProtectMemory # 0.014000
    ok 6 TestCryptoCertEnumCertificatesInStore # 0.000000

1. https://testanything.org/

Fixes: #19367
 2021-04-28 09:28:25 -04:00
Brad King a3aa5596a1 Tests: Isolate TestDriver build directories 2021-04-28 09:19:58 -04:00
Zack Galbreath 63b5ddcce2 Tests: Add cases for CTest extra measurements from tests 2021-04-27 14:06:44 -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
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 9d4a0f12fb Merge topic 'SWIG' 
e3e005dbd8 UseSWIG: use swig dependencies for Xcode generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6042
 2021-04-26 11:35:22 -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
Marc Chevrier e3e005dbd8 UseSWIG: use swig dependencies for Xcode generator 2021-04-23 17:09:12 +02: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
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
Brad King c54c284de7 Tests: Improve RunCMake.CPack* test error formatting 
Format message content for `message(FATAL_ERROR)`.
 2021-04-22 13:54:56 -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
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 051c3a0449 Find{BLAS,LAPACK}: Add test case covering BLA_STATIC with Intel MKL 2021-04-21 14:41:54 -04:00
Brad King f3f715688f Find{BLAS,LAPACK}: Add test case covering BLA_STATIC with Generic vendor 2021-04-21 14:41:54 -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
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 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 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 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
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
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 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
Joel Johnson 370bebd921 Add missing 'not' in error messages 2021-04-16 07:47:59 -06:00
Marc Chevrier d67cc4882d Xcode: Add support of DEPFILE for add_custom_command 
Issue: #20286
 2021-04-15 12:17:31 -04:00
Robert Maynard d5c3e4ac32 cmake: add support for --toolchain command argument 2021-04-15 10:13:49 -04:00
Brad King e4649d1d15 Find{BLAS,LAPACK}: Add test case covering Intel MKL 2021-04-14 14:57:03 -04:00
Marc Chevrier 0c47b91fcc Genex: add_custom_command: DEPFILE supports genex 
This facility is very useful for 'Ninja Multi-Config' and required
as well for future support of DEPFILE in 'Xcode' and 'Visual Studio'
generators (#20286).
 2021-04-12 13:06:49 +02:00
Craig Scott f62a2bf44f Tests: Factor out XcodeProject-Embed check function findAttribute() 2021-04-11 18:06:16 +10:00
Brad King 21f0478ade Merge topic 'presets-optional-generator-and-builddir' 
06e6981336 cmake-presets: Make generator and binaryDir fields optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5946
 2021-04-08 07:49:56 -04:00
Brad King a0e5998bd6 Merge topic 'ctest-wait-verbosity' 
82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode
80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5990
 2021-04-08 07:49:05 -04:00
Brad King f39ea2e292 Merge topic 'flags-with-backslash' 
3953dfcb31 Restore support for backslashes in initial language-wide flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5995
 2021-04-08 07:47:09 -04:00
Brad King 3953dfcb31 Restore support for backslashes in initial language-wide flags 
Refactoring in commit bdc40742bd (CMakeDetermineCompilerId: Test without
COMPILER_ID_FLAGS if REQUIRE_SUCCESS, 2021-02-27, v3.20.0-rc3~6^2) added
an extra macro layer through which flag strings are passed.  That caused
an extra level of argument re-parsing, and broke flags with backslashes.
Pass flags to the helper macro through variable names instead.

Fixes: #22041
 2021-04-07 13:53:22 -04:00
friendlyanon 06e6981336 cmake-presets: Make generator and binaryDir fields optional 
In v3 of the presets, generator and buildDir can be omitted to fall
back to regular cmake behavior when these values are not explicitly
provided by the user.

Fixes: #21987
 2021-04-07 01:24:44 +02:00