summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake_path: various updatesMarc Chevrier2021-01-135-24/+14
| | | | | | To follow discussions in #21385 and !5682: * Fix bug in cmCMakePath::IsSuffix() method * cmake_path(HASH) always normalized paths (NORMALIZE option removed)
* CMake Nightly Date StampKitware Robot2021-01-131-1/+1
|
* Merge topic 'FindHDF5docfix'Brad King2021-01-121-9/+31
|\ | | | | | | | | | | | | | | 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
| * FindHDF5: List imported targets in debug outputKris Thielemans2021-01-111-0/+15
| | | | | | | | | | If HDF5_FIND_DEBUG, list all targets that are defined (from either FindHDF5.cmake or the hdf5-config.cmake).
| * FindHDF5: correct and describe list of imported targetKris Thielemans2021-01-111-9/+16
| |
* | Merge topic 'FindJPEG-turbo'Brad King2021-01-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5683
| * | FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' tooMiguel Medalha2021-01-111-1/+1
| | |
* | | Merge topic 'cuda_architectures_default_doc'Brad King2021-01-121-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | baa530fe9f Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5685
| * | | Help: Add example for setting default CMAKE_CUDA_ARCHITECTURES valueRaul Tambre2021-01-101-0/+15
| | |/ | |/| | | | | | | Fixes #21302 and #21666.
* | | Merge topic 'sections-to-if-documentation'Brad King2021-01-121-19/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 55ba98556f Help: Add sections to if() conditions documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5677
| * | | Help: Add sections to if() conditions documentationShannon Booth2021-01-081-19/+35
| | | |
* | | | Merge topic 'cuda-nvcc-ccache-symlink'Brad King2021-01-124-3/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CUDA: Support nvcc symlinking to ccacheRong Ou2021-01-114-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invoke `nvcc -v` to find the real CUDA bin directory. This is needed if `nvcc` is a symlink to `ccache` or `colornvcc`. Fixes: #21177
* | | | | Merge topic 'ninja-multi-config-post-build'Brad King2021-01-128-15/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98805a11ce Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlap Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5673
| * | | | | Ninja Multi-Config: Run POST_BUILD when BYPRODUCTS don't overlapKyle Edwards2021-01-078-15/+69
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21252
* | | | | | Merge branch 'release-3.19'Brad King2021-01-120-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'trace_expand_bracket' into release-3.19Brad King2021-01-122-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5687
* | \ \ \ \ \ \ Merge topic 'trace_expand_bracket'Brad King2021-01-122-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5687
| * | | | | | | cmMakefile: Don't expand bracket arguments in --trace-expandRaul Tambre2021-01-112-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bracket arguments are literal and shouldn't be expanded. Fixes #21671.
* | | | | | | | Merge branch 'release-3.19'Brad King2021-01-120-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cmake-gui-qrc-fix' into release-3.19Brad King2021-01-121-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e20560a2dc cmake-gui: Restore linking of Qt resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5691
* | | | | | | | Merge topic 'cmake-gui-qrc-fix'Brad King2021-01-121-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'master' into cmake-gui-qrc-fixKyle Edwards2021-01-111749-18586/+33647
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | cmake-gui: Restore linking of Qt resourcesKyle Edwards2021-01-111-2/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | CMake Nightly Date StampKitware Robot2021-01-121-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'makefiles-compiler-deps'Brad King2021-01-116-48/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Makefiles: ensure transparent switch between dependencies strategiesMarc Chevrier2021-01-091-24/+39
| | | | | | | |
| * | | | | | | Makefile dependencies: ensure long paths are used on WindowsMarc Chevrier2021-01-095-24/+44
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'FindPostgreSQL-server-not-required'Brad King2021-01-111-4/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f254e67bf6 FindPostgreSQL: Do not require pg_type.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5656
| * | | | | | FindPostgreSQL: Do not require pg_type.hAlexey Edelev2021-01-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In systems where PostgreSQL has separate developer packages for server and client libraries `PostgreSQL_TYPE_INCLUDE_DIR` is not specified. According to initial logic server part was not required but was accidentally added to `REQUIRED_VARS` during the migration to `find_package_handle_standard_args`. Fixes: #17223
* | | | | | | CMake Nightly Date StampKitware Robot2021-01-111-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-01-101-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2021-01-091-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'reword_MSVC_documentation'Brad King2021-01-081-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1185438ea8 Help: Reword the MSVC variable documentation focusing on cl.exe compatibility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5676
| * | | | Help: Reword the MSVC variable documentation focusing on cl.exe compatibilityThomas Bernard2021-01-071-3/+2
| | |_|/ | |/| | | | | | | | | | Fixes: #21651
* | | | Merge topic 'Help-guide-import-export-dest'Brad King2021-01-081-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e58a76de51 Help/guide: fix importing-exporting CMake install destinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5674
| * | | | Help/guide: fix importing-exporting CMake install destinationsBen Boeckel2021-01-071-3/+3
| | | | |
* | | | | Merge branch 'release-3.19'Brad King2021-01-080-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'rel-macos-modern' into release-3.19Brad King2021-01-0813-29/+200
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'rel-macos-modern'Brad King2021-01-0813-29/+211
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | gitlab-ci: add a job to upload macOS 10.10 binariesBrad King2021-01-071-0/+11
| | | | | | |
| * | | | | | Merge branch 'backport-rel-macos-modern' into rel-macos-modernBrad King2021-01-0712-29/+197
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+Brad King2021-01-079-28/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Utilities/Release: Add script to build Qt 5.15.2 macOS universal binariesBrad King2021-01-071-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Utilities/Release: Fix macOS Qt 5.9 build script umaskBrad King2021-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Produce a tarball with world-readable permissions.
| | * | | | | cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+Brad King2021-01-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | gitlab-ci: update upload jobs to go to cmake.orgBrad King2021-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upload binaries to `cmake.org` through its own name rather than through the `public.kitware.com` alias.
| * | | | | | cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+Brad King2021-01-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'cmake-gui-qt6'Brad King2021-01-081-5/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | cmake-gui: Restore minimal plugin installation for Qt5Brad King2021-01-071-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-02-04 17:34:12 (GMT)