mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,896 Commits 2 Branches 391 Tags
4df3f5300a13827336ca5329b53834cf0fb63a7d
Commit Graph

52896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot
4b60072620 CMake Nightly Date Stamp 2021-04-30 00:01:09 -04:00
Brad King
137125ffff Merge branch 'release-3.20' 2021-04-29 10:55:32 -04:00
Brad King
1ad4501ae9 CMake 3.20.2 v3.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
KWSys Upstream
18513fa118 KWSys 2021-04-29 (5655d533) 
Code extracted from:

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

at commit 5655d533a9a4fb59b87d364c896339f1d454d420 (master).

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

Brad King (1):
      6e59fd94 Process: Suppress NVHPC warning in FD_ZERO
 2021-04-29 09:45:42 -04:00
Brad King
9edff7f43e Merge topic 'remove_bad_install_dir_schema_docs' 
306db0fdb8 cmake-presets: Remove incorrect documentation for `installDir`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6051
 2021-04-29 09:23:24 -04:00
Brad King
d94f8516ab Merge topic 'find-msys' 
990b370401 FindMsys: Add a module to find MSYS and some bundled packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6057
 2021-04-29 09:22:27 -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
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
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
Brad King
3974d850a6 Merge branch 'release-3.20' 2021-04-29 09:15:33 -04:00
Brad King
402df643e5 Merge topic 'intel-2021' into release-3.20 
9c479c7c40 IntelLLVM: Add special case for ifx 2021.1 version extraction
b7193ab18f Intel: Update Classic compiler version detection for 2021

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6052
 2021-04-29 09:15:32 -04:00
Brad King
3147f541f7 Merge topic 'intel-2021' 
9c479c7c40 IntelLLVM: Add special case for ifx 2021.1 version extraction
b7193ab18f Intel: Update Classic compiler version detection for 2021

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6052
 2021-04-29 09:15:32 -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
Orgad Shaneh
990b370401 FindMsys: Add a module to find MSYS and some bundled packages 2021-04-28 10:41:17 -04:00
Brad King
9c479c7c40 IntelLLVM: Add special case for ifx 2021.1 version extraction 
The ifx beta versions forgot to define `__INTEL_LLVM_COMPILER`, and
instead define `__INTEL_COMPILER == 201900`.  Add a special case.

Issue: #22120
 2021-04-28 10:21:27 -04:00
Brad King
b7193ab18f Intel: Update Classic compiler version detection for 2021 
The value of the `__INTEL_COMPILER` macro changed convention starting
in version 2021.

Fixes: #22120
 2021-04-28 10:20:59 -04: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
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
Brad King
49c6d0f261 Merge topic 'ctest_test_measurements_docs' 
b60789a758 Help: Document CTest custom test measurements
63b5ddcce2 Tests: Add cases for CTest extra measurements from tests
52eac4573d Help: Fix link to cdash.org from CTest manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !6029
 2021-04-28 09:53:04 -04:00
Brad King
c58ec3209b Merge topic 'cpack-nsis-uninstall-name' 
79f48da5c2 CPack/NSIS: Fix CPACK_NSIS_UNINSTALL_NAME when not Uninstall.exe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6050
 2021-04-28 09:51:00 -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
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
Craig Scott
9178861245 Merge topic 'doc-LINK_DEPENDS_NO_SHARED-xref' 
9f2c3928cd Help: Convert CMAKE_LINK_DEPENDS_NO_SHARED to cross-reference link

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6056
 2021-04-28 07:14:17 -04:00
Kitware Robot
857373c53c CMake Nightly Date Stamp 2021-04-28 00:01:11 -04:00
Craig Scott
9f2c3928cd Help: Convert CMAKE_LINK_DEPENDS_NO_SHARED to cross-reference link 2021-04-28 09:26:31 +10:00
Zack Galbreath
b60789a758 Help: Document CTest custom test measurements 2021-04-27 15:00:26 -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
Zack Galbreath
63b5ddcce2 Tests: Add cases for CTest extra measurements from tests 2021-04-27 14:06:44 -04:00
Markus Israelsson
79f48da5c2 CPack/NSIS: Fix CPACK_NSIS_UNINSTALL_NAME when not Uninstall.exe 
If a previous installation was detected by the NSIS script the
uninstaller was not correctly run unless it was still named
`Uninstall.exe`.  This meant that using `CPACK_NSIS_UNINSTALL_NAME`
was simply broken.

Fixes: #22103
 2021-04-27 14:06:42 -04:00
Zack Galbreath
52eac4573d Help: Fix link to cdash.org from CTest manual 2021-04-27 14:06:07 -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
0078db3888 ARMClang: Separate cpu/arch flags from preceding flags 
Suggested-by: Kim Kryger
 2021-04-27 13:58:57 -04:00
Brad King
95afd87917 Merge topic 'FindIconv-no-libc' 
404025b00c FindIconv: Avoid explicitly finding C runtime library
8b30e7adfb FindIntl: Use explicit find_library signature NAMES keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
Merge-request: !6046
 2021-04-27 13:54:51 -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