mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,648 Commits 2 Branches 401 Tags
4d1883df1142fbe5c23cb7f433f619c1a7322984
Commit Graph

57648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier 4d1883df11 Genex-PATH_EQUAL: path comparison 
To complete issue #23498
 2022-06-01 15:28:54 +02:00
Craig Scott f3be15e438 Merge topic 'genex-PATH' 
f11e66670b Genex-PATH: path handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7292
 2022-06-01 08:28:07 -04:00
Marc Chevrier e8ce8f0858 Merge topic 'findjava' 
3acbe073ba FindJava: improve failure/verbosity when 'java -version' fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7299
 2022-06-01 08:11:37 -04:00
Kitware Robot dc061c47b5 CMake Nightly Date Stamp 2022-06-01 00:01:11 -04:00
Brad King 0b30568219 Merge topic 'update-zlib' 
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
 2022-05-31 12:00:47 -04:00
Brad King 61653ab7d3 Merge topic 'update-kwiml' 
a1abb27be2 Merge branch 'upstream-KWIML' into update-kwiml
f171b651b4 KWIML 2022-05-27 (47070837)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7304
 2022-05-31 11:59:35 -04:00
Brad King 8c11f0d33a Merge branch 'release-3.23' 2022-05-31 11:57:38 -04:00
Brad King 949dd14106 Merge branch 'release-3.22' 2022-05-31 11:57:37 -04:00
Brad King 5d797c4d73 Merge branch 'release-3.21' 2022-05-31 11:57:34 -04:00
Brad King 87611181fc Merge branch 'release-3.20' 2022-05-31 11:57:32 -04:00
Brad King 3ede9ed771 Merge branch 'release-3.22' into release-3.23 2022-05-31 11:57:13 -04:00
Brad King c26255665a Merge branch 'release-3.21' into release-3.22 2022-05-31 11:56:43 -04:00
Brad King 245edf39fc Merge branch 'release-3.20' into release-3.21 2022-05-31 11:56:27 -04:00
Brad King 9c3786427d Merge branch 'release-3.23' 2022-05-31 11:55:10 -04:00
Brad King 9d89c9af46 Merge topic 'cmake-gui-locale' 
ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7303
 2022-05-31 11:55:10 -04:00
Brad King eeb6dcad94 Merge topic 'cmake-gui-locale' into release-3.23 
ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7303
 2022-05-31 11:55:08 -04:00
Marc Chevrier f11e66670b Genex-PATH: path handling 
Fixes: #23498
 2022-05-31 15:39:51 +02:00
Seth R Johnson 3acbe073ba FindJava: improve failure/verbosity when 'java -version' fails 
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.
 2022-05-31 07:34:49 -04:00
Kitware Robot fa21bd9527 CMake Nightly Date Stamp 2022-05-31 00:01:08 -04:00
Kitware Robot 45093acd1f CMake Nightly Date Stamp 2022-05-30 00:01:11 -04:00
Kitware Robot 9f4aec6d61 CMake Nightly Date Stamp 2022-05-29 00:01:13 -04:00
Brad King e6e7b615af zlib: Update build within CMake for 1.2.12 2022-05-28 06:45:49 -04:00
Brad King 152b4f8920 Merge branch 'upstream-zlib' into update-zlib 
* upstream-zlib:
  zlib 2022-03-27 (21767c65)
 2022-05-28 06:44:43 -04:00
Kitware Robot 04ff557917 CMake Nightly Date Stamp 2022-05-28 00:01:16 -04:00
Brad King a1abb27be2 Merge branch 'upstream-KWIML' into update-kwiml 
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2022-05-27 (47070837)
 2022-05-27 13:46:45 -04:00
KWIML Upstream f171b651b4 KWIML 2022-05-27 (47070837) 
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
 2022-05-27 13:46:45 -04:00
Brad King 5f6c4c86aa Merge branch 'cmake-gui-locale' into release-3.22 
Merge-request: !7303
 2022-05-27 12:02:11 -04:00
Brad King 7b3d228067 Merge branch 'cmake-gui-locale' into release-3.21 
Merge-request: !7303
 2022-05-27 12:02:01 -04:00
Brad King a539aed6bf Merge branch 'cmake-gui-locale' into release-3.20 
Merge-request: !7303
 2022-05-27 12:01:41 -04:00
Brad King ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows 
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
 2022-05-27 11:52:51 -04:00
Brad King 8838ea2ba5 Merge topic 'update-zlib' 
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
 2022-05-27 09:14:16 -04:00
Brad King 49e31d9c55 Merge topic 'msvc-compilers-default-to-ZI' 
5fcadc481e MSVC: Default to -ZI instead of /Zi for x86 and x64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7295
 2022-05-27 09:10:43 -04:00
Brad King 6a2ee6f977 Merge topic 'mingw-compiler-PATH' 
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
 2022-05-27 09:09:23 -04:00
Kitware Robot 8ab866c641 CMake Nightly Date Stamp 2022-05-27 00:01:09 -04:00
Brad King 55ba10dcfd MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler 
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
 2022-05-26 13:26:54 -04:00
Brad King 9019537670 MSYS/MinGW Makfiles: Select the compiler occurring first in PATH 
Extend the change from commit e01990999a (Ninja: On Windows, select the
compiler occurring first in PATH, 2020-04-17, v3.18.0-rc1~291^2) to
apply to the MSYS/MinGW Makefiles generators too.  Drop the implied
`gcc` and `g++` default compilers.  This allows MinGW/Clang environments
to work out of the box.

Inspired-by: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Fixes: #23542
 2022-05-26 13:22:58 -04:00
zlib upstream ffdaa419d7 zlib 2022-03-27 (21767c65) 
Code extracted from:

    https://github.com/madler/zlib.git

at commit 21767c654d31d2dccdde4330529775c6c5fd5389 (v1.2.12).
 2022-05-26 12:30:51 -04:00
Brad King 933293dbc2 zlib: Update script to get zlib 1.2.12 2022-05-26 12:30:29 -04:00
Brad King 87b304f649 zlib: Add CMakeLists.txt for build within CMake 2022-05-26 12:29:41 -04:00
Brad King b0d97aeea5 zlib: Use unistd.h on all non-Windows platforms 
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.
 2022-05-26 12:29:41 -04:00
Brad King 19881cbdec zlib: Suppress some MSVC warnings 
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).
 2022-05-26 12:29:41 -04:00
Brad King 0d201ad25b zlib: Add initialization to satisfy valgrind 
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.
 2022-05-26 12:29:41 -04:00
Brad King 512c1f8f75 zlib: Fix typo in comment 
Restore the fix from commit bf019d765d (Fix spelling and typos
(non-binary), 2012-11-07, v2.8.12~414^2~7).
 2022-05-26 12:29:40 -04:00
Brad King 2be780ba5b Merge branch 'upstream-zlib' into update-zlib 
# By zlib upstream
* upstream-zlib:
  zlib 2011-09-09 (abf180a0)
 2022-05-26 12:29:03 -04:00
Brad King 40a17e3f5e zlib: add script to import zlib 1.2.3 from upstream 
CMake has vendored this version for a long time.
Import it using our modern approach.
 2022-05-26 12:28:36 -04:00
Brad King fc22ac115e zlib: Drop old sources to make room for a fresh import 2022-05-26 12:28:21 -04:00
zlib upstream 75737ab312 zlib 2011-09-09 (abf180a0) 
Code extracted from:

    https://github.com/madler/zlib.git

at commit abf180a067223611620dd97dd5681df7c7fa7c9b (v1.2.3).
 2022-05-26 10:50:53 -04:00
Brad King d45b4f59a4 Merge topic 'verify-interface-header-sets-list' 
aadaac7f6d VERIFY_INTERFACE_HEADER_SETS: Add property for list of header sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7298
 2022-05-26 09:12:21 -04:00
Brad King 799a01996b Merge topic 'automoc-build-dir' 
76608c60d3 AutoMoc: Take AUTOMOC_BUILD_DIR into account in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7291
 2022-05-26 09:11:07 -04:00
Glen Chung 5fcadc481e MSVC: Default to -ZI instead of /Zi for x86 and x64 
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
 2022-05-26 09:06:01 -04:00