summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.19.4v3.19.4Brad King2021-01-281-1/+1
|
* Merge topic 'doc-multi-config-prop' into release-3.19Brad King2021-01-251-2/+6
|\ | | | | | | | | | | | | | | 1d7daa668c Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIG Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5737
| * Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIGBrad King2021-01-251-2/+6
| | | | | | | | Fixes: #21739
* | Merge topic 'intel-fortran-nofor-main' into release-3.19Brad King2021-01-251-1/+1
|\ \ | |/ |/| | | | | | | | | 2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5729
| * Intel: Replace deprecated Fortran flag -nofor_main with -nofor-mainBrad King2021-01-221-1/+1
|/ | | | | | | | | | The `-nofor_main` flag was originally added by commit ccdd3e943d (Fix Intel Fortran SHARED libraries on Linux, 2009-10-27, v2.8.2~915). Since then, Intel Fortran renamed the option to `-nofor-main` and deprecated the old name. The new name has been available for a long time, so we can just switch to it. Fixes: #21735
* Merge topic 'ci-wix-download' into release-3.19Brad King2021-01-214-0/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | 127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download 8efbb0c95f ci: download WiX on Windows 5e5fecb7bc ci: speed up cmake and ninja downloads on Windows 6c34835a26 Merge branch 'backport-ninja-no-cleandead' into release-3.18 41ec2a4fac Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18 035a0c497a Merge branch 'cuda_detect_vs_codegen' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5725
| * Merge branch 'backport-3.18-ci-wix-download' into ci-wix-downloadBrad King2021-01-214-0/+23
| |\ |/ /
| * ci: download WiX on WindowsBrad King2021-01-212-0/+21
| | | | | | | | Avoid requiring Windows CI hosts to have WiX installed.
| * ci: speed up cmake and ninja downloads on WindowsBrad King2021-01-212-0/+2
| | | | | | | | | | Invoke-WebRequest uses a progress bar by default, but we have no interactive session anyway. Turn it off to speed up downloads.
| * Merge branch 'backport-ninja-no-cleandead' into release-3.18Brad King2020-12-142-15/+1
| |\ | | | | | | | | | Merge-request: !5614
| * \ Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18Brad King2020-12-071-2/+10
| |\ \ | | | | | | | | | | | | Merge-request: !5574
| * \ \ Merge branch 'cuda_detect_vs_codegen' into release-3.18Brad King2020-11-251-4/+8
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5531
* | \ \ \ Merge topic 'vs-sdk-selection' into release-3.19Brad King2021-01-216-4/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e67482daf VS: Generalize Win10 max SDK version to all VS generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5721
| * | | | | VS: Generalize Win10 max SDK version to all VS generatorsjonathan molinatto2021-01-206-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` variable added in CMake 3.19 by commit ba497111f6 (VS: Add option for custom Win10 SDK version maximum, 2020-08-20, v3.19.0-rc1~262^2) was documented as if it worked for all generators but implemented only to override CMake's builtin default for the VS 2015 max SDK version. Generalize the variable to set a custom max SDK version for later VS versions too. Fixes: #21720
* | | | | | Merge topic 'FindHDF5-silence-output' into release-3.19Brad King2021-01-211-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b924669385 FindHDF5: silence STATUS messages when found with QUIET 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5722
| * | | | | | FindHDF5: silence STATUS messages when found with QUIETBen Boeckel2021-01-201-3/+3
| | | | | | |
| * | | | | | FindHDF5: avoid writing to the output when testing h5ccBen Boeckel2021-01-201-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution of this tool can output error logs to the output during configure. This can then be caught by CTest and flagged as an error during the build.
* | | | | | Merge topic 'macos-include-weak-dependencies' into release-3.19Brad King2021-01-214-4/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected f2d92b983b GetPrerequisites: Include weak macOS dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5703
| * | | | | file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detectedBianca van Schaik2021-01-203-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Clang 12, `otool -l` reports `LC_LOAD_WEAK_DYLIB` instead of `LC_LOAD_DYLIB` for weakly linked libraries. Update the implementation of `file(GET_RUNTIME_DEPENDENCIES)` to recognize these. Fixes: #21684
| * | | | | GetPrerequisites: Include weak macOS dependenciesBianca van Schaik2021-01-201-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Clang 12, `otool -L` adds `, weak` to weakly linked libraries. Update GetPrerequisites to recognize these. Issue: #21684
* | | | | Merge topic 'CMake-cross-compiling' into release-3.19Brad King2021-01-191-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cee4c6a8b Restore support for cross-compiling CMake itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5713
| * | | | | Restore support for cross-compiling CMake itselfMarc Chevrier2021-01-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit eb583b0a66 (cmake_path command: path management, 2020-07-23, v3.19.0-rc1~216^2~1) we added a `try_run`. In cross-compilation mode, C++ features tests must avoid running tests if there is no emulator defined.
* | | | | | Merge topic 'irsl-msvcp_atomic_wait_dll' into release-3.19Brad King2021-01-181-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5702
| * | | | | IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRTKelly Walker2021-01-151-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #21675
* | | | | CMake 3.19.3v3.19.3Brad King2021-01-131-1/+1
| | | | |
* | | | | 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
| * | | | | 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 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
| * | | | | 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
* | | | | 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
| * | | | | 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.
* | | | | | Merge topic 'xcode-object-ids' into release-3.19Brad King2021-01-089-40/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Xcode: Use deterministic object ids for script build phasesBrad King2021-01-065-10/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode "new build system" only considers a script build phase up to date if it has run before, even if outputs are newer than inputs. Use a deterministic object id for script build phases associated with custom commands so that they do not need to re-run after CMake re-generates the project. Fixes: #21669
| * | | | | cmGlobalXCodeGenerator: Add infrastructure for deterministic object idsBrad King2021-01-062-15/+28
| | | | | |
| * | | | | cmGlobalXCodeGenerator: Adopt pbxproj object id generationBrad King2021-01-066-28/+30
|/ / / / /
* | | | | Merge topic 'FindHDF5-dbg-and-rel' into release-3.19Brad King2021-01-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5267ba9d63 FindHDF5: Fix finding both debug and release libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5653
| * | | | | FindHDF5: Fix finding both debug and release libsKris Thielemans2021-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that the `debug` and `optimized` keywords work. In commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) we added use of `HDF5_LIBRARIES`, but the value may contain `debug` and `optimized` keywords. Fixes: #21637
* | | | | | Merge topic 'ci-xcode-12.3' into release-3.19Brad King2021-01-061-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5670
| * | | | | | gitlab-ci: update macOS jobs to use Xcode 12.3Brad King2021-01-061-4/+4
|/ / / / / /
* | | | | | Merge topic 'FindMPI-oneapi-single-quotes' into release-3.19Brad King2021-01-051-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5b223aa7f FindMPI: remove single quotes from include path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5654
| * | | | | FindMPI: remove single quotes from include pathEduard Valeyev2021-01-041-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel OneAPI's MPI wraps include paths into single quotes, remove them when sanitizing _MPI_INCLUDE_PATH Fixes: #21634
* | | | | Merge topic 'rel-linux-aarch64' into release-3.19Brad King2020-12-2314-13/+406
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary 76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries 595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bruno Verachten <gounthar@gmail.com> Merge-request: !5538
| * | | | | Help: Add 3.19.3 release note for Linux aarch64 binaryBrad King2020-12-221-0/+5
| | | | | |
| * | | | | gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branchHi Key2020-12-224-7/+53
| | | | | |
| * | | | | Utilities/Release: Add docker specs for Linux aarch64 binariesHi Key2020-12-229-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base them on the existing `x86_64` specs. Update the centos base image from centos 6 to centos 7 to get aarch64 support. The resulting binaries require GLIBC 2.17. Fixes: #17923
| * | | | | gitlab-ci: consolidate Linux release package job spec for x86_64Brad King2020-12-221-7/+2
| | | | | |