mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,775 Commits 2 Branches 401 Tags
9ac426e46075871a283e6b2afdeb3792a70e5744
Commit Graph

53775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard 9ac426e460 NVHPC-C: Add support for C17 2021-08-05 16:19:23 -04:00
Robert Maynard f5dbc27c27 NVHPC-CXX: Add support for C++20 2021-08-05 16:19:12 -04:00
Brad King fbf5a368c9 Merge topic 'cpack-rpm-pre-semicolon' into release-3.21 
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
 2021-08-03 11:01:08 -04:00
Brad King 54be23df7f Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into release-3.21 
213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6421
 2021-08-03 10:59:38 -04:00
Brad King aa1426da4a Merge topic 'help-get_filename_path-fix-version-changed' into release-3.21 
8b28fe5670 Help: get_filename_component: fix version info for cmake_path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6423
 2021-08-03 10:57:44 -04:00
Artur Samarin 3cdf23985f CPackRPM: avoid a spurious ; in the %pre and other sections with scripts 
This was accidentally added by commit 34c8a23044 (CPackRPM: add
scriplets tags only if scripts exist, 2021-04-01, v3.21.0-rc1~387^2).

Fixes: #22501
 2021-08-02 15:04:22 -04:00
Brad King e9b8d6fdbc Merge topic 'vs-iface-include-dirs' into release-3.21 
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6411
 2021-08-02 14:07:13 -04:00
Brad King d14a1ae859 Merge topic 'nvhpc-MD-flag' into release-3.21 
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6408
 2021-08-02 14:05:34 -04:00
Brad King 00535bab00 Merge topic 'autogen-ui-header-depends' into release-3.21 
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !6404
 2021-08-02 14:04:08 -04:00
Marc Chevrier 8b28fe5670 Help: get_filename_component: fix version info for cmake_path 
Fixes: #22505
 2021-08-02 11:12:46 +02:00
Craig Scott 28ce8a932d Merge topic 'doc-dmg-filesystem' into release-3.21 
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6416
 2021-08-02 04:56:23 -04:00
Craig Scott 6fb63e56df Merge topic 'doc-presets-toolchain-file' into release-3.21 
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6417
 2021-08-02 04:54:49 -04:00
Marc Chevrier 213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER 
Fixes: #22486
 2021-08-01 15:24:16 +02:00
Craig Scott ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE 2021-07-31 17:08:42 +10:00
Craig Scott 03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM 2021-07-31 11:14:26 +10:00
Brad King 53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries 
Since commit 4391913133 (Add INTERFACE libraries to generated
buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1), the
VS generator may process INTERFACE libraries.  Avoid code paths in the
generator that process include directories because they should not be
used by INTERFACE libraries since they do not compile anything.

Fixes: #22494
 2021-07-29 11:38:58 -04:00
Robert Maynard 7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc 2021-07-29 10:43:54 -04:00
Brad King 516ac348c7 Merge topic 'haiku-platform' into release-3.21 
a1261ce917 Platform/Haiku: Remove the include-once behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6401
 2021-07-29 08:46:47 -04:00
Brad King 0a959bb271 Merge topic 'cuda_separable_clang_make' into release-3.21 
3975678fcc CUDA/Clang: Simplify --register-link-binaries logic
0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6400
 2021-07-29 08:45:40 -04:00
Brad King 5f1afff9f7 Merge topic 'ctest-test-changing-labels' into release-3.21 
26170ea306 CTest: Reset multi-options to persistent multi-options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6403
 2021-07-29 08:44:27 -04:00
Jessica Hamilton a1261ce917 Platform/Haiku: Remove the include-once behavior 
The behavior was added by commit 7ebc1cb2ff (Haiku: Several fixes to
platform module, 2013-10-05, v3.0.0-rc1~541^2~3), but was not explained
in its commit message.  No other platform modules do this.

The include-once behavior results in incorrect variables set in some
larger projects, e.g. .NET Core, particularly when cross-compiling,
`CMAKE_DL_LIBS` being one of these.  Remove it.
 2021-07-29 08:42:46 -04:00
root 3975678fcc CUDA/Clang: Simplify --register-link-binaries logic 
Move the logic for appending cubin afterwards, so the check can simply be
empty().
With the Makefile generator the option is now at the front instead of being
intermixed with the actual bins.
 2021-07-29 13:19:37 +03:00
root 0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles 
Seems the relative paths were wrong basically all around such that only
compiling files in the top-level directory would work. I've modified
CudaOnly.SeparateCompilation to cover this.

Fixes #22482.
 2021-07-29 13:19:37 +03:00
Alexey Edelev 283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp 
Follow up test for the commit 9cebdbec.
 2021-07-28 18:43:18 +02:00
Kyle Edwards 26170ea306 CTest: Reset multi-options to persistent multi-options 
44ad3f0b added multi-options to CTest, but didn't reset them,
causing ctest_test() to fail if it was run multiple times with
different label arguments. Reset the multi-options.

Fixes: #22485
 2021-07-28 09:58:28 -04:00
Brad King b880867e5a Merge topic 'cmake-presets-v2-inherit-v3-optional' into release-3.21 
3e42bf3e05 CMakePresets: Check presets with their own file version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6398
 2021-07-28 09:14:39 -04:00
Kyle Edwards 3e42bf3e05 CMakePresets: Check presets with their own file version 
06e6981 added support for optional binaryDir and generator, but
use the dependent preset's file version instead of the current
preset's file version. Check presets with their own file version
instead of their dependent's file version.

Fixes: #22428
 2021-07-27 11:45:57 -04:00
Brad King f7cf69e34a CMake 3.21.1 v3.21.1 2021-07-27 09:29:13 -04:00
Brad King 675c130091 Merge topic 'FindXCTest-xcode-12.5' into release-3.21 
0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6379
 2021-07-27 09:11:32 -04:00
Brad King f90e100b73 Merge topic 'disable-exec-info' into release-3.21 
aa4c30182b Add option to explicitly avoid using execinfo for backtraces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6386
 2021-07-27 09:10:31 -04:00
Brad King f90d995e1a Merge topic 'vs-flag-FS' into release-3.21 
937f454fb9 VS: Remove C++ module CompileAs flag table entries for v142 and v143
8fb349a80e VS: Remove cl /FS entry from flag table for v142 and v143

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Niels Dekker <niels_dekker_address_until_2024@xs4all.nl>
Merge-request: !6390
 2021-07-27 09:09:31 -04:00
Brad King a5f655bc0d Merge topic 'test-compile-options-none' into release-3.21 
91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6385
 2021-07-27 09:08:34 -04:00
Yauheni Khnykin 0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5 
The fix from commit eafe740ead (FindXCTest: Fix output directory for
test bundle with new build system, 2021-02-09, v3.19.5~5^2) is not
necessary with Xcode 12.5, which seems to have changed/fixed the
behaviour again.

Fixes: #22462
 2021-07-26 13:31:10 -04:00
Đoàn Trần Công Danh aa4c30182b Add option to explicitly avoid using execinfo for backtraces 
backtrace(3) from libexecinfo in musl will run into crash [1].

Provide an option to disable it explicitly even if libexecinfo is
present.

1: https://www.openwall.com/lists/musl/2021/07/17/1
 2021-07-26 12:14:02 -04:00
Brad King 0615aeffbf Merge topic 'update-kwsys' into release-3.21 
4977184128 Merge branch 'upstream-KWSys' into update-kwsys
7fc3f7001a KWSys 2021-07-26 (d5fd6ca2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6391
 2021-07-26 12:10:23 -04:00
Brad King 937f454fb9 VS: Remove C++ module CompileAs flag table entries for v142 and v143 
The `CompileAs` entry in a `.vcxproj` file with values:

* `CompileAsCppModule` for `-interface`
* `CompileAsCppModuleInternalPartition` for `-internalPartition`
* `CompileAsHeaderUnit` for `-exportHeader`

does not cause the corresponding flag to be added to the command line.
Drop the flag table entries so that the flags go to `AdditionalOptions`.

Fixes: #22477
 2021-07-26 10:49:26 -04:00
Brad King 8fb349a80e VS: Remove cl /FS entry from flag table for v142 and v143 
The `ForceSynchronousPDBWrites` entry in a `.vcxproj` file does not
actually cause the `/FS` flag to be added to the command line.

Fixes: #22476
 2021-07-26 10:45:09 -04:00
Brad King 4977184128 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-07-26 (d5fd6ca2)
 2021-07-26 10:17:18 -04:00
KWSys Upstream 7fc3f7001a KWSys 2021-07-26 (d5fd6ca2) 
Code extracted from:

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

at commit d5fd6ca2ba5b4ca04d7ac346ceb87f7d2b0ad8aa (master).

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

Dženan Zukić (1):
      7079df74 SystemTools: Fix GetOperatingSystemNameAndVersion empty string return

Đoàn Trần Công Danh (1):
      4e69b791 SystemInformation: Add option to explicitly avoid using execinfo
 2021-07-26 10:17:18 -04:00
Đoàn Trần Công Danh 91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None 
In the same spirit of commit ce1cadd35a, (Tests/ConfigSources: fix for
non main stream CMAKE_BUILD_TYPE, 2021-04-01).

Allow distributions' check to pass seemlessly.

Issue: #22470
 2021-07-26 09:50:26 -04:00
Brad King 0079f24f45 Merge topic 'doc-custom-command-depfiles' into release-3.21 
f6e5743d0e Help: Clarify and correct wording around DEPFILE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6387
 2021-07-26 09:39:55 -04:00
Brad King 00a3889c19 Merge topic 'ninja-multi-test-fix' into release-3.21 
08131e83bc Tests: Clean up Ninja Multi-Config test from cb777dd

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6383
 2021-07-26 09:36:49 -04:00
Brad King 98d813b92c Merge topic 'autouic-header-depends' into release-3.21 
e5ec0e52f4 AUTOUIC: Fix generating of dependency rules for UI header files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6380
 2021-07-26 09:34:51 -04:00
Brad King 2f7c4a788c Merge topic 'autogen-deps' into release-3.21 
4bda03370d AutoGen: Fix needless compilation of mocs_compilation.cpp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6381
 2021-07-26 09:33:56 -04:00
Craig Scott 9d9d527513 Merge topic 'doc-ctest-output' into release-3.21 
ba6d1947b6 Help: Add cross-references between test output size ctest variables
cdde9e5a10 Help: Improve wording and cross-referencing for ctest JUnit output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6389
 2021-07-26 07:48:02 -04:00
Craig Scott ba6d1947b6 Help: Add cross-references between test output size ctest variables 2021-07-26 21:08:45 +10:00
Craig Scott cdde9e5a10 Help: Improve wording and cross-referencing for ctest JUnit output 2021-07-25 21:37:29 +10:00
Craig Scott f6e5743d0e Help: Clarify and correct wording around DEPFILE option 
The previous wording contradicted itself regarding whether
Visual Studio generators were supported, and about when
generator expressions could be used. Restructure the paragraphs
and max it clearer what support was added in which CMake
versions.
 2021-07-24 15:08:21 +10:00
Kyle Edwards 08131e83bc Tests: Clean up Ninja Multi-Config test from cb777dd 2021-07-23 13:22:59 -04:00
Joerg Bornemann 4bda03370d AutoGen: Fix needless compilation of mocs_compilation.cpp 
For an AUTOMOC'ed target foo, when depfiles are used, there are the
following dependencies:

foo_autogen -> foo_autogen/timestamp
foo_autogen/mocs_compilation.cpp -> foo_autogen/timestamp

The first is used to trigger AUTOGEN.
The second erroneously triggers a recompilation of
mocs_compilation.cpp when any source file of target foo is touched.

Remove the latter dependency and replace it with an order-only
dependency from foo_autogen/mocs_compilation.cpp to
foo_autogen_timestamp_deps.

That is achieved by making mocs_compilation.cpp or its
per-configuration variants byproduct(s) of the timestamp file.

Fixes: #22338
 2021-07-23 15:47:28 +02:00