summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GNUInstallDirs: Do not treat /opt/homebrew as under /optBrad King2022-06-021-1/+3
| | | | Fixes: #23579
* Merge topic 'doc-RULE_LAUNCH_COMPILE'Brad King2022-06-026-8/+44
|\ | | | | | | | | | | | | e281ba27b7 Help: Clarify that RULE_LAUNCH_COMPILE is meant for internal use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7317
| * Help: Clarify that RULE_LAUNCH_COMPILE is meant for internal useCraig Scott2022-06-026-8/+44
| | | | | | Fixes: #22405
* | Merge topic 'doc-preset-versionadded'Brad King2022-06-021-1/+16
|\ \ | | | | | | | | | | | | | | | | | | 5a9c7f76c0 Help: Document CMake version adding each preset version in cmake-presets(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7313
| * | Help: Document CMake version adding each preset version in cmake-presets(7)Brad King2022-06-011-1/+16
| |/ | | | | | | Fixes: #23485
* | Merge topic 'ci-release-artifacts'Brad King2022-06-022-0/+23
|\ \ | | | | | | | | | | | | | | | | | | 6cef17bc6e gitlab-ci: name artifacts produced by release package jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7312
| * | gitlab-ci: name artifacts produced by release package jobsBrad King2022-06-012-0/+23
| |/ | | | | | | | | | | Name the `.zip` file that GitLab CI uses to hold the package artifacts. Use a different name for each platform/architecture combination so that we can download them all to a single local directory without conflicts.
* | Merge topic 'ci-win-package'Brad King2022-06-0215-454/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 0b953d01a6 Utilities/Release: Drop docker specs for Windows binaries 230eaa1d55 Utilities/Release: Document Linux aarch64 packaging support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7311
| * | Utilities/Release: Drop docker specs for Windows binariesBrad King2022-06-0115-454/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4c7c66dcf5 (gitlab-ci: Add jobs to make Windows x86_64 and i386 packages, 2022-05-19), we use CI jobs to produce Windows binaries. Revert commit ff929badb3 (Utilities/Release: Add docker specs to build and test Windows binaries, 2020-05-05, v3.18.0-rc1~203^2~1). The filesystem inside Windows containers is too slow to support parallel builds efficiently.
| * | Utilities/Release: Document Linux aarch64 packaging supportBrad King2022-06-011-0/+1
| |/ | | | | | | | | This was accidentally left out of commit e14fb01c41 (Utilities/Release: Add docker specs for Linux aarch64 binaries, 2020-11-25, v3.19.3~8^2~2).
* | Merge topic 'automoc-silence-ranlib-warning'Brad King2022-06-021-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | 4a9daae483 automoc: silence linker warning on macos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7296
| * | automoc: silence linker warning on macosTim Blechmann2022-06-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when an empty `mocs_compilation.cpp` is included in a static library, the macos linker emits a warning: ``` /Applications/Xcode13.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: path/To/Library.a(mocs_compilation.cpp.o) has no symbols ``` we therefore generate a globally visible weak symbol in the form of a virtual function table
* | | Merge branch 'release-3.23'Brad King2022-06-020-0/+0
|\ \ \
| * \ \ Merge topic 'tutorial-cmath' into release-3.23Brad King2022-06-023-19/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c84eca210 Tutorial: Simplify logic checking for cmath functions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7314
* | \ \ \ Merge topic 'tutorial-cmath'Brad King2022-06-023-19/+19
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c84eca210 Tutorial: Simplify logic checking for cmath functions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7314
| * | | | Tutorial: Simplify logic checking for cmath functionsBrad King2022-06-013-19/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 07223c5c27 (Tutorial: Update Step 5 to work on Windows, 2020-02-18, v3.18.0-rc1~655^2) the logic does not work on non-Windows platforms when cmake is re-run on an existing build tree. It is also more complicated than we'd like for a tutorial example. Avoid the need to consider the `m` library case by performing the check as C++. Since `check_cxx_symbol_exists` cannot handle overloaded functions like `exp` and `log`, check with `check_cxx_source_compiles` instead. This also presents a more general-purpose example in the tutorial. Fixes: #23524
* | | | CMake Nightly Date StampKitware Robot2022-06-021-1/+1
| |_|/ |/| |
* | | Merge branch 'release-3.23'Brad King2022-06-010-0/+0
|\ \ \ | |/ /
| * | Merge branch 'release-3.22' into release-3.23Brad King2022-06-011-3/+3
| |\ \
* | \ \ Merge branch 'release-3.22'Brad King2022-06-011-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.22.5v3.22.5Brad King2022-06-012-4/+4
| | | |
* | | | Merge branch 'release-3.23'Brad King2022-06-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.22' into release-3.23Brad King2022-06-011-2/+2
| |\ \ \ | | |/ /
* | | | Merge branch 'release-3.22'Brad King2022-06-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.21' into release-3.22Brad King2022-06-011-2/+2
| |\ \ \
* | \ \ \ Merge branch 'release-3.21'Brad King2022-06-011-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | CMake 3.21.7v3.21.7Brad King2022-06-012-3/+3
| | | | |
* | | | | Merge topic 'ninja-dedup-def'Brad King2022-06-017-58/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cc417586e Ninja: Avoid duplicating /DEF: linker flag with MSVC tools 39dba8a244 cmLocalGenerator: Adopt AppendModuleDefinitionFlag method Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7307
| * | | | | Ninja: Avoid duplicating /DEF: linker flag with MSVC toolsBrad King2022-05-312-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9a0d5a828a (Ninja: add /DEF: flag to linker call, 2012-03-10, v2.8.8~22^2~7) the logic should have been added to `GetTargetFlags` in place of the older logic in that method from commit 7cef36c628 (ENH: add the ability to generate custom commands for a language that is not supported by an IDE, 2004-10-21, v2.4.0~2655). Fixes: #23570
| * | | | | cmLocalGenerator: Adopt AppendModuleDefinitionFlag methodBrad King2022-05-317-41/+41
| | |_|_|/ | |/| | | | | | | | | | | | | Migrate from `cmCommonTargetGenerator::AddModuleDefinitionFlag`.
* | | | | Merge topic 'genex-PATH'Craig Scott2022-06-0131-1/+1818
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f11e66670b Genex-PATH: path handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7292
| * | | | | Genex-PATH: path handlingMarc Chevrier2022-05-3131-1/+1818
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23498
* | | | | | Merge topic 'findjava'Marc Chevrier2022-06-012-21/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3acbe073ba FindJava: improve failure/verbosity when 'java -version' fails Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7299
| * | | | | | FindJava: improve failure/verbosity when 'java -version' failsSeth R Johnson2022-05-312-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS monterey, `java -version` returns ``` The operation couldn’t be completed. Unable to locate a Java Runtime. Please visit http://www.java.com for information on installing Java. ``` which does not match the existing regex. Instead of hitting a fatal error if required, reset the variable and let FindPackage handle the result. If `QUIET` is requested, don't print anything if the version query fails. Otherwise, print the message. Additionally, clean up temporary variables set by the execute_process commands.
* | | | | | | CMake Nightly Date StampKitware Robot2022-06-011-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'update-zlib'Brad King2022-05-3130-3647/+16074
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e7b615af zlib: Update build within CMake for 1.2.12 152b4f8920 Merge branch 'upstream-zlib' into update-zlib ffdaa419d7 zlib 2022-03-27 (21767c65) 933293dbc2 zlib: Update script to get zlib 1.2.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7302
| * | | | | | zlib: Update build within CMake for 1.2.12Brad King2022-05-281-1/+4
| | | | | | |
| * | | | | | Merge branch 'upstream-zlib' into update-zlibBrad King2022-05-2828-3642/+16062
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-zlib: zlib 2022-03-27 (21767c65)
| | * | | | | | zlib 2022-03-27 (21767c65)zlib upstream2022-05-2628-3643/+16063
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/madler/zlib.git at commit 21767c654d31d2dccdde4330529775c6c5fd5389 (v1.2.12).
| * | | | | | | zlib: Update script to get zlib 1.2.12Brad King2022-05-261-4/+8
| | | | | | | |
* | | | | | | | Merge topic 'update-kwiml'Brad King2022-05-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1abb27be2 Merge branch 'upstream-KWIML' into update-kwiml f171b651b4 KWIML 2022-05-27 (47070837) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7304
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2022-05-271-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWIML Upstream * upstream-KWIML: KWIML 2022-05-27 (47070837)
| | * | | | | | | | KWIML 2022-05-27 (47070837)KWIML Upstream2022-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit 47070837bea9d9f51f8bfdbc7fff962b56607414 (master). Upstream Shortlog ----------------- Brad King (1): 47070837 int.h: Fix format specifier for 'long long' on Embarcadero compiler
* | | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-310-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-05-310-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'release-3.22'Brad King2022-05-310-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'release-3.21' into release-3.22Brad King2022-05-310-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'cmake-gui-locale' into release-3.22Brad King2022-05-271-0/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7303
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2022-05-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'release-3.20' into release-3.21Brad King2022-05-310-0/+0
| |\ \ \ \ \ \ \ \ \ \