mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,194 Commits 2 Branches 401 Tags
34469a4f71c523488682661aafc8d13b054ed5b9
Commit Graph

51194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 34469a4f71 Merge topic 'custom-command-output-genex-nmc' 
1526ae3aba Tests: Add cases for Ninja Multi-Config cross-config custom commands
dcf9f4d2f7 Ninja Multi-Config: Add support for cross-config custom commands
15467f12f7 cmLocalGenerator: Adopt custom target 'force' output name generation
7b64b0cd5a cmLocalGenerator: Refactor custom command generator construction
d29da8ed3e cmMakefile: Simplify custom target 'force' output name generation
2b1cc175ee Help: Clarify version adding add_custom_{command,target} OUTPUT genex support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5612
 2020-12-16 06:20:39 -05:00
Brad King d8654c2a02 Merge topic 'cmake-gui-system-icon' 
47649baf60 cmake-gui: Use icon from system theme if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5616
 2020-12-16 06:18:01 -05:00
Brad King d124a4b4d4 Merge branch 'release-3.19' 2020-12-16 06:17:08 -05:00
Brad King 80148daa2c Merge topic 'cmake-gui-completion' 
854f5ea1cb cmake-gui: Restore completion during path editing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5619
 2020-12-16 06:17:08 -05:00
Brad King cd107321f7 Merge topic 'cmake-gui-completion' into release-3.19 
854f5ea1cb cmake-gui: Restore completion during path editing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5619
 2020-12-16 06:17:07 -05:00
Kitware Robot 4098b2beb6 CMake Nightly Date Stamp 2020-12-16 00:01:13 -05:00
Brad King 854f5ea1cb cmake-gui: Restore completion during path editing 
Revert commit 0fc1818831 (QCMakeWidgets: replace QDirModel, 2020-06-15,
v3.19.0-rc1~696^2).  `QFileSystemModel` is not a drop-in replacement for
`QDirModel`.  Additional changes are needed to make it work fully.
Revert the change and suppress the `QDirModel` deprecation warning
pending further investigation.

Fixes: #21589
 2020-12-15 08:40:13 -05:00
Brad King 1526ae3aba Tests: Add cases for Ninja Multi-Config cross-config custom commands 2020-12-15 08:17:55 -05:00
Loren Burkholder 47649baf60 cmake-gui: Use icon from system theme if available 2020-12-15 07:48:51 -05:00
Brad King 25a1cdef95 Merge topic 'FindQt3-find-sig' 
38fce6d23b FindQt3: Add missing NAMES/PATHS keywords to find_ calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5611
 2020-12-15 07:44:18 -05:00
Brad King 807c903c55 Merge topic 'issue-20915' 
6d0712c225 file(configure): Order of named options should be specified in any order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5608
 2020-12-15 07:43:36 -05:00
Brad King 38acdc5d3a Merge topic 'issue-21557-test-cases' 
8851637e9f cmake_policy: Implement test cases for cmake_policy VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5610
 2020-12-15 07:42:56 -05:00
Brad King 7a0c28a760 Merge topic 'issue-21557' 
99a98eefac cmake_policy: Add check for return value of SetPolicyVersion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5607
 2020-12-15 07:41:47 -05:00
Brad King 367bae9f82 Merge branch 'release-3.19' 2020-12-15 07:40:35 -05:00
Brad King 7932e0a46e Merge topic 'ispc_control_header_suffixes' into release-3.19 
c9a50f3556 ISPC: Generated Headers suffix configurable with a better default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5597
 2020-12-15 07:40:34 -05:00
Brad King 67f12dd1d6 Merge topic 'ispc_control_header_suffixes' 
c9a50f3556 ISPC: Generated Headers suffix configurable with a better default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5597
 2020-12-15 07:40:34 -05:00
Brad King 38dbbae26c Merge branch 'release-3.19' 2020-12-15 07:38:20 -05:00
Brad King 3fb889a0e6 Merge topic 'support_CMAKE_VFS_OVERLAY_for_rc_compilation' 
18ee6d7e32 llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5604
 2020-12-15 07:38:20 -05:00
Brad King 795c5fe239 Merge topic 'support_CMAKE_VFS_OVERLAY_for_rc_compilation' into release-3.19 
18ee6d7e32 llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5604
 2020-12-15 07:38:19 -05:00
Brad King 0ed42946a1 Merge branch 'release-3.18' 2020-12-15 07:36:50 -05:00
Brad King 51156a5542 Merge branch 'release-3.17' 2020-12-15 07:36:43 -05:00
Brad King c30bde0b50 Merge topic 'ninja-no-cleandead' into release-3.19 
1144d25094 Merge branch 'backport-ninja-no-cleandead' into ninja-no-cleandead
73a961eaba Ninja: Remove cleandead on regeneration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5614
 2020-12-15 07:36:07 -05:00
Brad King a7e8336f08 Merge branch 'release-3.19' 2020-12-15 07:36:07 -05:00
Brad King b485e86363 Merge topic 'ninja-no-cleandead' 
1144d25094 Merge branch 'backport-ninja-no-cleandead' into ninja-no-cleandead
73a961eaba Ninja: Remove cleandead on regeneration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5614
 2020-12-15 07:36:07 -05:00
Brad King 51338446e9 Merge branch 'release-3.19' 2020-12-15 07:35:01 -05:00
Brad King 8cb2506afb Merge topic 'rel-macos-apple-silicon' 
23de430545 Utilities/Release: Update macOS Qt 5.9 build for platform versioning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5615
 2020-12-15 07:35:01 -05:00
Brad King f206f47936 Merge topic 'rel-macos-apple-silicon' into release-3.19 
23de430545 Utilities/Release: Update macOS Qt 5.9 build for platform versioning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5615
 2020-12-15 07:35:00 -05:00
Craig Scott 8f47e95ed2 Merge branch 'release-3.19' 2020-12-15 07:16:26 -05:00
Craig Scott a65506d56b Merge topic 'CMakePackageConfigHelpers-version-range' into release-3.19 
7f44760991 CMakePackageConfigHelpers: Relax restrictions on version range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5613
 2020-12-15 07:16:26 -05:00
Craig Scott defd29243f Merge topic 'CMakePackageConfigHelpers-version-range' 
70b69b6aaf Merge branch 'backport-3.19-CMakePackageConfigHelpers-version-range' into CMakePackageConfigHelpers-version-range
55c3b6a77e CMakePackageConfigHelpers: Relax restrictions on version range
7f44760991 CMakePackageConfigHelpers: Relax restrictions on version range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5613
 2020-12-15 07:16:26 -05:00
Kyle Edwards dcf9f4d2f7 Ninja Multi-Config: Add support for cross-config custom commands 
Co-Author: Brad King <brad.king@kitware.com>
 2020-12-15 07:01:21 -05:00
Brad King 15467f12f7 cmLocalGenerator: Adopt custom target 'force' output name generation 2020-12-15 07:00:53 -05:00
Brad King 7b64b0cd5a cmLocalGenerator: Refactor custom command generator construction 
Add support for constructing and using multiple generators for one
custom command.  cmGeneratorTarget contains a code path that needs this
behavior when used with Ninja but not other generators, so use virtual
dispatch through cmLocalGenerator.
 2020-12-15 07:00:52 -05:00
Brad King d29da8ed3e cmMakefile: Simplify custom target 'force' output name generation 
Remove unnecessary check of policy CMP0049.  The policy can never
trigger on our internally-generated name because it has no variable
references.

The rename in commit 0ed5ce4cd8 (cmTarget: Rename AddSource method for
backward compatibility., 2014-03-17, v3.1.0-rc1~688^2~17) made it look
like this code path depended on CMP0049.  Then commit 0e1faa28cb
(cmMakefile: Separate custom command setup from actual creation,
2019-09-14, v3.16.0-rc1~85^2) and commit ea1bed34b2 (cmMakefile: Extract
utilities used for creation of custom commands, 2019-09-21,
v3.16.0-rc1~52^2~1) built additional infrastructure to thread that
dependence through the call stack.  Remove it all.
 2020-12-15 07:00:52 -05:00
Brad King 2b1cc175ee Help: Clarify version adding add_custom_{command,target} OUTPUT genex support 
Update the documentation added by commit c257c25419
(add_custom_{command,target}: Add genex support to OUTPUT and
BYPRODUCTS, 2020-10-19) to use sphinx markup instead of prose to specify
the version in which the feature was added.
 2020-12-15 07:00:20 -05:00
Kitware Robot 09a324fbc2 CMake Nightly Date Stamp 2020-12-15 00:01:09 -05:00
Craig Scott 70b69b6aaf Merge branch 'backport-3.19-CMakePackageConfigHelpers-version-range' into CMakePackageConfigHelpers-version-range 2020-12-15 09:34:59 +11:00
Marc Chevrier 55c3b6a77e CMakePackageConfigHelpers: Relax restrictions on version range 2020-12-15 09:24:09 +11:00
Robert Maynard c9a50f3556 ISPC: Generated Headers suffix configurable with a better default 
The target property `ISPC_HEADER_SUFFIX` and associated global
variable now can control the suffix used when generating the
C/C++ interoperability ISPC headers.

In addition the default suffix is now "_ispc.h" which matches the
common convention that the ISPC compiler team uses and recommends.
 2020-12-14 13:13:09 -05:00
Brad King 23de430545 Utilities/Release: Update macOS Qt 5.9 build for platform versioning 
Backport the upstream Qt patch [1] to link Qt binaries using the
`-isysroot` flag instead of `-Wl,-syslibroot`.  This is needed so that
the binaries have a SDK version set, which is needed for runtime
validation on modern macOS versions.

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6387138a7991b4588639dc48847f175b5afaff84
 2020-12-14 11:33:30 -05:00
Thomas Bernard 18ee6d7e32 llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags 
Issue: #20658
 2020-12-14 11:08:12 -05:00
Brad King 6c34835a26 Merge branch 'backport-ninja-no-cleandead' into release-3.18 
Merge-request: !5614
 2020-12-14 10:22:16 -05:00
Brad King 7aaa425d17 Merge branch 'backport-ninja-no-cleandead' into release-3.17 
Merge-request: !5614
 2020-12-14 10:21:53 -05:00
Brad King 1144d25094 Merge branch 'backport-ninja-no-cleandead' into ninja-no-cleandead 2020-12-14 10:14:19 -05:00
Brad King 73a961eaba Ninja: Remove cleandead on regeneration 
Remove the `cleandead` tool invocation added by commit fb18215904
(Ninja: clean ninja metadata once generated, 2019-05-13,
v3.17.0-rc1~207^2).  The tool deletes files that were not previously
deleted by regenerating the build system.  Also, there are use cases
where no-longer-generated files should not be removed, such as Qt's TS
files.

Fixes: #21549
 2020-12-14 10:08:14 -05:00
Marc Chevrier 7f44760991 CMakePackageConfigHelpers: Relax restrictions on version range 2020-12-14 14:42:26 +01:00
Brad King 38fce6d23b FindQt3: Add missing NAMES/PATHS keywords to find_ calls 
These are needed when using `PATH_SUFFIXES` to get the full signatures.

Fixes: #21594
 2020-12-14 08:38:16 -05:00
Brad King 82b25be80a Merge topic 'FindMatlab-MCR' 
9c360b9eea FindMatlab: Fix search for MCR
bda5e2ac8f FindMatlab: Only include engine and dataarray libraries if they are found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5600
 2020-12-14 07:28:42 -05:00
Brad King fedfe763ee Merge topic 'custom-command-output-genex' 
c257c25419 add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTS
f36af9228b cmLocalGenerator: Evaluate generator expressions in custom command outputs
c887cefd9a cmLocalGenerator: Simplify custom command output cmSourceFile creation
947ba01bf9 cmLocalGenerator: Factor out helper to expand custom command output paths
1902d28ebc cmLocalGenerator: Refactor UpdateOutputToSourceMap to avoid boolean trap
e4034eabe9 cmLocalGenerator: Re-order logic in CreateGeneratedSource
706c48301d cmCustomCommandGenerator: Treat relative outputs w.r.t. build dir
5d23c5446e cmCustomCommandGenerator: Refactor OUTPUT and DEPENDS path evaluation
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5402
 2020-12-14 07:22:45 -05:00
Brad King 979af92e9e Merge topic 'doc-try_compile-typos' 
1f41eb8472 Help: Fix small typos in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5609
 2020-12-14 07:20:34 -05:00