mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 10:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,168 Commits 2 Branches 391 Tags
38dbbae26ca1bc5f6c65b38f596e74899a19cae1
Commit Graph

51168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Guillem Vela
1f41eb8472 Help: Fix small typos in documentation 2020-12-14 07:18:47 -05:00
Brad King
f62bcd08aa Merge topic 'makefiles-compiler-deps-optims' 
b2ff3c52df cmDependsCompiler: rely now on cmGccDepfileReader for depfile parser

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5599
 2020-12-14 07:16:05 -05:00
Brad King
06dae10c9b Merge topic 'automoc-autouic-autorcc-not-csharp' 
f65f20938c Autogen: Avoid processing CSharp targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5507
 2020-12-14 07:15:01 -05:00
Brad King
7ad7ac4167 Merge topic 'update-curl' 
d0bac89cea curl: Set build options the way we need for CMake
54931fdff0 Merge branch 'upstream-curl' into update-curl
5aacc593a9 curl 2020-12-09 (e0528597)
4cd65e5d88 curl: Update script to get curl 7.74.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5592
 2020-12-14 07:14:16 -05:00
Brad King
6aff058ab4 Merge topic 'FindGLUT-macos-tbd' into release-3.19 
d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5601
 2020-12-14 07:11:07 -05:00
Brad King
b4a17cc0cc Merge branch 'release-3.19' 2020-12-14 07:11:07 -05:00
Brad King
528fbd61b7 Merge topic 'FindGLUT-macos-tbd' 
d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5601
 2020-12-14 07:11:07 -05:00
Brad King
7be4b24ae6 Merge topic 'macos-homebrew-apple-silicon' into release-3.19 
1a5c1a68b6 macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Fons Rademakers <fons.rademakers@cern.ch>
Merge-request: !5602
 2020-12-14 07:10:04 -05:00
Brad King
33a8a4adff Merge branch 'release-3.19' 2020-12-14 07:10:04 -05:00
Brad King
41d8c20221 Merge topic 'macos-homebrew-apple-silicon' 
1a5c1a68b6 macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Fons Rademakers <fons.rademakers@cern.ch>
Merge-request: !5602
 2020-12-14 07:10:04 -05:00
Brad King
627e390ff7 Merge branch 'release-3.19' 2020-12-14 07:08:50 -05:00
Brad King
4cdf951f07 Merge topic 'install-properties' into release-3.19 
63db7ae9c4 cmake: Clear INSTALL file properties between runs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5603
 2020-12-14 07:08:49 -05:00
Brad King
f70814c3fd Merge topic 'install-properties' 
63db7ae9c4 cmake: Clear INSTALL file properties between runs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5603
 2020-12-14 07:08:49 -05:00
Brad King
04ed1e73dd Merge topic 'execute_process-command-error' into release-3.19 
e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5588
 2020-12-14 07:07:46 -05:00
Brad King
0d5649c67b Merge branch 'release-3.19' 2020-12-14 07:07:46 -05:00
Brad King
922ad5c6b9 Merge topic 'execute_process-command-error' 
e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5588
 2020-12-14 07:07:46 -05:00
Kitware Robot
0a6c7cdd07 CMake Nightly Date Stamp 2020-12-14 00:01:19 -05:00
Kitware Robot
703a58cba3 CMake Nightly Date Stamp 2020-12-13 00:02:09 -05:00
Kitware Robot
4621ffb028 CMake Nightly Date Stamp 2020-12-12 00:01:10 -05:00
Brad King
1a5c1a68b6 macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon 
According to https://brew.sh/2020/12/01/homebrew-2.6.0/ the `/opt/homebrew`
directory is recommended for installing ARM architecture brew packages.

Fixes: #21585
 2020-12-11 13:07:17 -05:00
Brad King
23df57a3a7 Merge topic 'apple-silicon-host-arch' into release-3.19 
b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5589
 2020-12-11 13:05:34 -05:00
Brad King
0064981f6f Merge branch 'release-3.19' 2020-12-11 13:05:34 -05:00
Brad King
794aa36b1f Merge topic 'apple-silicon-host-arch' 
b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5589
 2020-12-11 13:05:34 -05:00