mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,411 Commits 2 Branches 393 Tags
bd0700d1079a6eab32b5fa1dff651027bc27b7f3
Commit Graph

51411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
bd0700d107 Merge topic 'sections-to-if-documentation' 
55ba98556f Help: Add sections to if() conditions documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5677
 2021-01-12 10:28:49 -05:00
Brad King
d87a8934e0 Merge topic 'cuda-nvcc-ccache-symlink' 
fb2afef620 CUDA: Support nvcc symlinking to ccache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5620
 2021-01-12 10:27:19 -05:00
Brad King
db8e2e711a Merge topic 'ninja-multi-config-post-build' 
98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5673
 2021-01-12 10:25:07 -05:00
Brad King
462dc20efa Merge branch 'release-3.19' 2021-01-12 10:20:26 -05:00
Brad King
b7485c98a0 Merge topic 'trace_expand_bracket' 
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5687
 2021-01-12 10:20:26 -05:00
Brad King
4304767ae4 Merge topic 'trace_expand_bracket' into release-3.19 
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5687
 2021-01-12 10:20:26 -05:00
Brad King
6fc33ab446 Merge branch 'release-3.19' 2021-01-12 10:19:29 -05:00
Brad King
97a713cf25 Merge topic 'cmake-gui-qrc-fix' 
9f48a468cd Merge branch 'master' into cmake-gui-qrc-fix
e20560a2dc cmake-gui: Restore linking of Qt resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5691
 2021-01-12 10:19:29 -05:00
Brad King
c3c63801f8 Merge topic 'cmake-gui-qrc-fix' into release-3.19 
e20560a2dc cmake-gui: Restore linking of Qt resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5691
 2021-01-12 10:19:28 -05:00
Kitware Robot
6b50b8d947 CMake Nightly Date Stamp 2021-01-12 00:01:09 -05:00
Kyle Edwards
9f48a468cd Merge branch 'master' into cmake-gui-qrc-fix 2021-01-11 15:00:51 -05:00
Kyle Edwards
e20560a2dc cmake-gui: Restore linking of Qt resources 
Refactoring in commit 41e223deb3 (CMake GUI: Split up into libraries,
add test shim, 2020-09-14, v3.19.0-rc1~116^2~2) broke linking of Qt
resources, such as the Add/Remove Entry button icons.

Fixes: #21682
 2021-01-11 14:57:53 -05:00
Raul Tambre
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand 
Bracket arguments are literal and shouldn't be expanded.

Fixes #21671.
 2021-01-11 19:54:18 +02:00
Brad King
06dfa5a7b6 Merge topic 'makefiles-compiler-deps' 
bb64ea5741 Makefiles: ensure transparent switch between dependencies strategies
8ec7408d74 Makefile dependencies: ensure long paths are used on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5655
 2021-01-11 11:28:58 -05:00
Brad King
0b32dfb292 Merge topic 'FindPostgreSQL-server-not-required' 
f254e67bf6 FindPostgreSQL: Do not require pg_type.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5656
 2021-01-11 11:27:04 -05:00
Rong Ou
fb2afef620 CUDA: Support nvcc symlinking to ccache 
Invoke `nvcc -v` to find the real CUDA bin directory.
This is needed if `nvcc` is a symlink to `ccache` or `colornvcc`.

Fixes: #21177
 2021-01-11 00:18:04 -08:00
Kitware Robot
1fb0670f4b CMake Nightly Date Stamp 2021-01-11 00:01:15 -05:00
Kitware Robot
aaebbd200b CMake Nightly Date Stamp 2021-01-10 00:03:09 -05:00
Marc Chevrier
bb64ea5741 Makefiles: ensure transparent switch between dependencies strategies 2021-01-09 11:35:17 +01:00
Marc Chevrier
8ec7408d74 Makefile dependencies: ensure long paths are used on Windows 2021-01-09 11:35:00 +01:00
Kitware Robot
ce874fbcd6 CMake Nightly Date Stamp 2021-01-09 00:01:11 -05:00
Shannon Booth
55ba98556f Help: Add sections to if() conditions documentation 2021-01-09 10:03:46 +13:00
Brad King
4f5a12be29 Merge topic 'reword_MSVC_documentation' 
1185438ea8 Help: Reword the MSVC variable documentation focusing on cl.exe compatibility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5676
 2021-01-08 09:12:47 -05:00
Brad King
90cd5df20c Merge topic 'Help-guide-import-export-dest' 
e58a76de51 Help/guide: fix importing-exporting CMake install destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5674
 2021-01-08 09:12:08 -05:00
Brad King
8ced3b10ad Merge branch 'release-3.19' 2021-01-08 09:10:25 -05:00
Brad King
fb79784136 Merge topic 'rel-macos-modern' into release-3.19 
6410425e5b ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+
bbec5a03c8 Utilities/Release: Add script to build Qt 5.15.2 macOS universal binaries
97e238f61b Utilities/Release: Fix macOS Qt 5.9 build script umask
2c5f30b472 cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+
3679b74a69 gitlab-ci: update upload jobs to go to cmake.org

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5672
 2021-01-08 09:10:24 -05:00
Brad King
0289224560 Merge topic 'rel-macos-modern' 
dbac5b6934 gitlab-ci: add a job to upload macOS 10.10 binaries
2d4d9cd37a Merge branch 'backport-rel-macos-modern' into rel-macos-modern
6410425e5b ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+
bbec5a03c8 Utilities/Release: Add script to build Qt 5.15.2 macOS universal binaries
97e238f61b Utilities/Release: Fix macOS Qt 5.9 build script umask
2c5f30b472 cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+
3679b74a69 gitlab-ci: update upload jobs to go to cmake.org
63079b97f0 cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5672
 2021-01-08 09:10:24 -05:00
Brad King
b7718ab6ca Merge topic 'cmake-gui-qt6' 
a6abe70e72 cmake-gui: Restore minimal plugin installation for Qt5
8dd88a5224 cmake-gui: Restore exclusion of static plugin installation
a65db7ef6a cmake-gui: Restore installation of Qt plugin dependencies
321cb5978f cmake-gui: Remove outdated FIXME comment about plugin installation
d391d05e3a cmake-gui: Fix CMake_QT_MAJOR_VERSION string comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5675
 2021-01-08 09:09:28 -05:00
Brad King
48f5b36aee Merge topic 'xcode-object-ids' into release-3.19 
b8b6573db8 Xcode: Use deterministic object ids for script build phases
2892228dc9 cmGlobalXCodeGenerator: Add infrastructure for deterministic object ids
d250b67722 cmGlobalXCodeGenerator: Adopt pbxproj object id generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5671
 2021-01-08 09:07:18 -05:00
Brad King
6632583848 Merge branch 'release-3.19' 2021-01-08 09:07:18 -05:00
Brad King
38335f275f Merge topic 'xcode-object-ids' 
b8b6573db8 Xcode: Use deterministic object ids for script build phases
2892228dc9 cmGlobalXCodeGenerator: Add infrastructure for deterministic object ids
d250b67722 cmGlobalXCodeGenerator: Adopt pbxproj object id generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5671
 2021-01-08 09:07:18 -05:00
Kitware Robot
3aca3f8144 CMake Nightly Date Stamp 2021-01-08 00:01:13 -05:00
Brad King
dbac5b6934 gitlab-ci: add a job to upload macOS 10.10 binaries 2021-01-07 16:57:07 -05:00
Brad King
2d4d9cd37a Merge branch 'backport-rel-macos-modern' into rel-macos-modern 2021-01-07 16:56:48 -05:00
Brad King
6410425e5b ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+ 
In order to support modern macOS features like Dark Mode, we need to use
Qt 5.15, which requires macOS 10.13.  However, we still want to support
macOS 10.10 as well, for which we need to use Qt 5.9.  Build separate
macOS packages for these use cases.

Fixes: #21606
Issue: #20825
 2021-01-07 16:56:05 -05:00
Thomas Bernard
1185438ea8 Help: Reword the MSVC variable documentation focusing on cl.exe compatibility 
Fixes: #21651
 2021-01-07 16:32:48 -05:00
Brad King
bbec5a03c8 Utilities/Release: Add script to build Qt 5.15.2 macOS universal binaries 
These may be used to build a CMake universal binary for macOS that supports
both architectures on Apple Silicon and is compatible with OS X 10.13.
 2021-01-07 16:10:07 -05:00
Brad King
97e238f61b Utilities/Release: Fix macOS Qt 5.9 build script umask 
Produce a tarball with world-readable permissions.
 2021-01-07 16:10:07 -05:00
Brad King
2c5f30b472 cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+ 
According to https://bugreports.qt.io/browse/QTBUG-59428, Qt 5.10 and
above moved macOS style handling into a separate `qmacstyle` plugin.
Install the plugin in our `CMake.app` package on macOS.

Issue: #21606
 2021-01-07 16:10:07 -05:00
Brad King
3679b74a69 gitlab-ci: update upload jobs to go to cmake.org 
Upload binaries to `cmake.org` through its own name rather than
through the `public.kitware.com` alias.
 2021-01-07 16:09:28 -05:00
Brad King
63079b97f0 cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+ 
According to https://bugreports.qt.io/browse/QTBUG-59428, Qt 5.10 and
above moved macOS style handling into a separate `qmacstyle` plugin.
Install the plugin in our `CMake.app` package on macOS.

Issue: #21606
 2021-01-07 13:22:31 -05:00
Brad King
a6abe70e72 cmake-gui: Restore minimal plugin installation for Qt5 
Since commit f1de6f6682 (cmake-gui: Support building against Qt6,
2020-12-17) all available plugins for each Qt component are installed.
This installs more than we need for CMake, so restore Qt5-specific logic
to install only the plugins did before.
 2021-01-07 13:19:48 -05:00
Brad King
8dd88a5224 cmake-gui: Restore exclusion of static plugin installation 
This was broken by commit f1de6f6682 (cmake-gui: Support building
against Qt6, 2020-12-17).
 2021-01-07 13:19:48 -05:00
Brad King
a65db7ef6a cmake-gui: Restore installation of Qt plugin dependencies 
Fix logic from commit f1de6f6682 (cmake-gui: Support building against
Qt6, 2020-12-17) to restore population of the `QT_PLUGINS` variable used
in our `fixup_bundle` call.
 2021-01-07 13:19:48 -05:00
Brad King
321cb5978f cmake-gui: Remove outdated FIXME comment about plugin installation 
Qt plugin installation conventions are now well-established.
 2021-01-07 13:19:48 -05:00
Brad King
d391d05e3a cmake-gui: Fix CMake_QT_MAJOR_VERSION string comparison 
Fix the string comparison added by commit 2e4cbaa521 (cmake-gui: Add a
Qt version control variable, 2020-12-28).  The version-based comparison
is not meant for arbitrary strings.
 2021-01-07 13:19:48 -05:00
Ben Boeckel
e58a76de51 Help/guide: fix importing-exporting CMake install destinations 2021-01-07 12:19:57 -05:00
Kyle Edwards
98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap 
Fixes: #21252
 2021-01-07 11:26:17 -05:00
Brad King
05f4248e3d Merge topic 'cpp-modules' 
39cbbb59a5 ninja: add experimental infrastructure to generate gcc-format modmap files
791b4d26d6 ninja: add experimental infrastructure to generate modmap files with dyndep
4b23359117 ninja: Add experimental infrastructure for C++20 module dependency scanning
f814d3b3c6 cmNinjaTargetGenerator: use $OBJ_FILE for the object
b0fc2993e1 Treat the '.mpp' file extension as C++ code
988f997100 cmScanDepFormat: Fix name of our internal tool in parse errors
dacd93a2db ninja: De-duplicate version numbers required for ninja features
533386ca29 cmStandardLevelResolver: Factor out helper to capture stoi exceptions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Shannon Booth <shannon.ml.booth@gmail.com>
Merge-request: !5562
 2021-01-07 08:26:28 -05:00
Brad King
520df2880b Merge topic 'fix-21620' 
8cb8dd6da5 AutoMoc: Re-run after adding Q_OBJECT macro
fefba42e37 Add a failing test case for #21620
2999c40dd9 Extend QtAutogen/RerunMoc
f623664e87 Do not use try_compile in RerunMocBasic test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5642
 2021-01-07 08:25:29 -05:00