summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cmake-gui-locale' into release-3.21Brad King2022-05-271-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Merge-request: !7303
* | | | | | | | | | | | Merge branch 'release-3.20'Brad King2022-05-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'cmake-gui-locale' into release-3.20Brad King2022-05-271-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Merge-request: !7303
* | | | | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'cmake-gui-locale' into release-3.23Brad King2022-05-311-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7303
* | | | | | | | | | | | Merge topic 'cmake-gui-locale'Brad King2022-05-311-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7303
| * | | | | | | | | | | cmake-gui: Restore support for internationalization with Qt5 on WindowsBrad King2022-05-271-0/+14
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the logic removed by commit 035078d847 (cmake-gui: Remove explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with Qt5 on Windows. Leave a FIXME comment to support Qt6 later. Fixes: #23562 Issue: #23565
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-311-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-301-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-291-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-281-1/+1
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'update-zlib'Brad King2022-05-2716-1520/+74
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87b304f649 zlib: Add CMakeLists.txt for build within CMake b0d97aeea5 zlib: Use unistd.h on all non-Windows platforms 19881cbdec zlib: Suppress some MSVC warnings 0d201ad25b zlib: Add initialization to satisfy valgrind 512c1f8f75 zlib: Fix typo in comment 2be780ba5b Merge branch 'upstream-zlib' into update-zlib 40a17e3f5e zlib: add script to import zlib 1.2.3 from upstream fc22ac115e zlib: Drop old sources to make room for a fresh import ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7300
| * | | | | | | | zlib: Add CMakeLists.txt for build within CMakeBrad King2022-05-261-0/+25
| | | | | | | | |
| * | | | | | | | zlib: Use unistd.h on all non-Windows platformsBrad King2022-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the `HAVE_UNISTD_H` change from commit 3edcd70754 (ENH: Update zlib to 1.2.3, 2007-09-11, v2.6.0~1135) with simpler logic.
| * | | | | | | | zlib: Suppress some MSVC warningsBrad King2022-05-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the warning suppression code added by commit 0e4571d25c (ENH: Initial import from VTK, 2005-01-26, v2.4.0~2414) and commit 3edcd70754 (ENH: Update zlib to 1.2.3, 2007-09-11, v2.6.0~1135).
| * | | | | | | | zlib: Add initialization to satisfy valgrindBrad King2022-05-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the change from commit cf133ff6b3 (Fix uninitialized variable access in zlib, 2009-11-18, v2.8.2~705). Their web site claims it does no harm ( https://www.zlib.net/zlib_faq.html#faq36), but fixing it this way eliminates the diagnostic.
| * | | | | | | | zlib: Fix typo in commentBrad King2022-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the fix from commit bf019d765d (Fix spelling and typos (non-binary), 2012-11-07, v2.8.12~414^2~7).
| * | | | | | | | Merge branch 'upstream-zlib' into update-zlibBrad King2022-05-2624-0/+10308
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By zlib upstream * upstream-zlib: zlib 2011-09-09 (abf180a0)
| | * | | | | | | zlib 2011-09-09 (abf180a0)zlib upstream2022-05-2624-0/+10308
| | / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/madler/zlib.git at commit abf180a067223611620dd97dd5681df7c7fa7c9b (v1.2.3).
| * | | | | | | zlib: add script to import zlib 1.2.3 from upstreamBrad King2022-05-261-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake has vendored this version for a long time. Import it using our modern approach.
| * | | | | | | zlib: Drop old sources to make room for a fresh importBrad King2022-05-2635-11843/+0
| | | | | | | |
* | | | | | | | Merge topic 'msvc-compilers-default-to-ZI'Brad King2022-05-2714-3/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fcadc481e MSVC: Default to -ZI instead of /Zi for x86 and x64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7295
| * | | | | | | | MSVC: Default to -ZI instead of /Zi for x86 and x64Glen Chung2022-05-2614-3/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a policy for compatibility. For more information, see [1]. [1] https://docs.microsoft.com/en-us/cpp/build/reference/z7-zi-zi-debug-information-format?view=msvc-170 Fixes: #10189
* | | | | | | | | Merge topic 'mingw-compiler-PATH'Brad King2022-05-275-69/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55ba10dcfd MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler 9019537670 MSYS/MinGW Makfiles: Select the compiler occurring first in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com> Merge-request: !7301
| * | | | | | | | | MSYS/MinGW Makefiles: Simplify selection of windres as Resource CompilerBrad King2022-05-263-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 957c2aac7f (RC: Simplify selection of resource compiler based on C/C++ toolchain, 2015-05-07, v3.3.0-rc1~101^2~3), `windres` is selected automatically when using compilers that target the GNU ABI. Drop the generator-specific preference to make behavior more consistent with the Ninja generator. Issue: #23542
generated by cgit v0.12 at 2025-09-15 13:19:47 (GMT)