mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 12:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,420 Commits 2 Branches 391 Tags
76f0bcdfb6e04f1f6089ea693d69b642bbf26e82
Commit Graph

51420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier
76f0bcdfb6 cmake_path: various updates 
To follow discussions in #21385 and !5682:
* Fix bug in cmCMakePath::IsSuffix() method
* cmake_path(HASH) always normalized paths (NORMALIZE option removed)
 2021-01-13 15:27:49 +01:00
Kitware Robot
3ad1ee8144 CMake Nightly Date Stamp 2021-01-13 00:01:14 -05:00
Brad King
20a7d4485c Merge topic 'FindHDF5docfix' 
eec3b775a7 FindHDF5: List imported targets in debug output
186b0f8131 FindHDF5: correct and describe list of imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5684
 2021-01-12 10:31:52 -05:00
Brad King
cc27ab0b27 Merge topic 'FindJPEG-turbo' 
74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5683
 2021-01-12 10:30:27 -05:00
Brad King
d591353126 Merge topic 'cuda_architectures_default_doc' 
baa530fe9f Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5685
 2021-01-12 10:29:43 -05:00
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
Miguel Medalha
74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too 2021-01-11 12:07:02 -05:00
Kris Thielemans
eec3b775a7 FindHDF5: List imported targets in debug output 
If HDF5_FIND_DEBUG, list all targets that are defined
(from either FindHDF5.cmake or the hdf5-config.cmake).
 2021-01-11 12:00:38 -05:00
Kris Thielemans
186b0f8131 FindHDF5: correct and describe list of imported target 2021-01-11 12:00:14 -05: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
Raul Tambre
baa530fe9f Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES value 
Fixes #21302 and #21666.
 2021-01-10 12:06:02 +02: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