mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
57,434 Commits 2 Branches 390 Tags
3f0b9663a449cd8c1fd96dc7dcdc475ff8fe9f2f
Commit Graph

57434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Würth
3f0b9663a4 FindZLIB: fix ZLIB_USE_STATIC_LIBS on Windows 
- on Windows, the ZLIB_USE_STATIC_LIBS options requires a reordering of
  the search names in order to prefer the static library, since in most
  cases both static and shared libraries are built
- add zlibwapi[d] library name for the contrib/vstudio builds
- add lib prefix and .dll.a suffix for the win32/Makefile.gcc build

Fixes #23140
 2022-05-13 18:26:27 +02:00
Brad King
e00e67cb92 Merge topic 'presets-pathListSep' 
ba969ce5fe cmake-presets: add ${pathListSep} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7234
 2022-05-13 08:54:08 -04:00
Brad King
ef7c0cb885 Merge topic 'FindGLUT-system-include-dirs' 
8041ca5df0 FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7252
 2022-05-13 08:52:04 -04:00
Brad King
300c91fecd Merge topic 'externalproject-uses-terminal-flags' 
b1c2cb0436 ExternalProject: Make SVN interactive with USES_TERMINAL_{DOWNLOAD,UPDATE}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7248
 2022-05-13 08:51:09 -04:00
Brad King
392e73e01a Merge topic 'doc-install-example-components' 
308b698f5d Help: Make install() example component names more consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7240
 2022-05-13 08:46:58 -04:00
Brad King
044854e7f7 Merge branch 'release-3.23' 2022-05-13 08:45:52 -04:00
Brad King
57559d2848 Merge topic 'ccmake-delete-cache' 
2defe9ff95 ccmake: Fix crash when deleting all cache entries
e1c85e29f4 ccmake: Move Initialization of Fields Inline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7257
 2022-05-13 08:45:51 -04:00
Brad King
c1d980f722 Merge topic 'ccmake-delete-cache' into release-3.23 
2defe9ff95 ccmake: Fix crash when deleting all cache entries
e1c85e29f4 ccmake: Move Initialization of Fields Inline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7257
 2022-05-13 08:45:50 -04:00
Brad King
4d8e4caeff Merge branch 'release-3.23' 2022-05-13 08:43:43 -04:00
Brad King
73f6393005 Merge branch 'release-3.22' 2022-05-13 08:43:37 -04:00
Brad King
f8a148f68c Merge branch 'release-3.22' into release-3.23 2022-05-13 08:43:22 -04:00
Brad King
09a6f199cd Merge branch 'release-3.23' 2022-05-13 08:42:49 -04:00
Brad King
9529863f2a Merge topic 'FindPkgConfig-LIBRARY_PATH' 
11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7258
 2022-05-13 08:42:49 -04:00
Brad King
165208c784 Merge topic 'FindPkgConfig-LIBRARY_PATH' into release-3.23 
11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7258
 2022-05-13 08:42:48 -04:00
Brad King
184fc13147 Merge branch 'release-3.23' 2022-05-13 08:41:56 -04:00
Brad King
968b5200a5 Merge topic 'FindPython-3.12' 
ca2877c039 FindPython: add support for Python 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7255
 2022-05-13 08:41:56 -04:00
Brad King
a0a1166935 Merge topic 'FindPython-3.12' into release-3.23 
ca2877c039 FindPython: add support for Python 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7255
 2022-05-13 08:41:55 -04:00
Brad King
6650969259 Merge branch 'release-3.23' 2022-05-13 08:40:46 -04:00
Brad King
3c64e40e90 Merge topic 'ci-msvc-19.32' 
cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7259
 2022-05-13 08:40:46 -04:00
Brad King
384c7521c4 Merge topic 'ci-msvc-19.32' into release-3.23 
cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7259
 2022-05-13 08:40:45 -04:00
Kitware Robot
ef0727f277 CMake Nightly Date Stamp 2022-05-13 00:01:07 -04:00
Brad King
cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset 2022-05-12 17:47:44 -04:00
Martin Duffy
2defe9ff95 ccmake: Fix crash when deleting all cache entries 
Prevents crash when deleting all cache entries.
Additionally, if advanced entries are hidden, no longer show the first advanced
entry when deleting all visible entries.

Fixes: #23499
 2022-05-12 16:43:15 -04:00
Martin Duffy
e1c85e29f4 ccmake: Move Initialization of Fields Inline 
Move initialization of simple fields in cmCursesMainForm inline.
 2022-05-12 16:40:58 -04:00
Brad King
d478dda0eb Merge branch 'FindPkgConfig-LIBRARY_PATH' into release-3.22 
Merge-request: !7258
 2022-05-12 13:34:21 -04:00
Brad King
11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} 
Fix the ENV save/restore added by commit 36979f5b43 (FindPkgConfig:
Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment, 2021-07-13,
v3.22.0-rc1~407^2) to unset the variable if it was originally not set.

While at it, clarify the value to which we temporarily set it. The
`pkg-config` and `pkgconf` tools only check that the variable is set,
and do not care about the value.  Set it to a more true-looking value.

Issue: #22148
 2022-05-12 13:18:24 -04:00
Letu Ren
8041ca5df0 FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/include 
Fixes: #23474
 2022-05-12 12:58:09 -04:00
Michael Hirsch
ca2877c039 FindPython: add support for Python 3.12 2022-05-12 10:55:11 -04:00
Michael Durso Jr
b1c2cb0436 ExternalProject: Make SVN interactive with USES_TERMINAL_{DOWNLOAD,UPDATE} 
ExternalProject_Add() supports USES_TERMINAL_* flags to enable user
input for different steps.  The Subversion download options ignored
these flags when checking out or updated a Subversion repo.

Fixes: #23348
 2022-05-12 10:40:35 -04:00
Erin Melucci
ba969ce5fe cmake-presets: add ${pathListSep} macro 
Fixes: #23282
 2022-05-12 10:37:49 -04:00
Jean-Christophe Fillion-Robin
308b698f5d Help: Make install() example component names more consistent 
This commit updates the documentation so that the component examples are
specified using title case to match convention used in both the existing
`Installing Exports` section and in the "Mastering CMake" book.
 2022-05-12 10:15:42 -04:00
Brad King
a1c61a7e1a Merge branch 'release-3.23' 2022-05-12 09:28:16 -04:00
Brad King
c67f0cd592 Merge topic 'doc-package-compatibility-mode' 
a82163839a CMakePackageConfigHelpers: Fix note about version files supporting ranges

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7254
 2022-05-12 09:28:16 -04:00
Brad King
2019bf5092 Merge topic 'doc-package-compatibility-mode' into release-3.23 
a82163839a CMakePackageConfigHelpers: Fix note about version files supporting ranges

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7254
 2022-05-12 09:28:15 -04:00
Brad King
9088133eec Merge topic 'FindOpenCL-3.0' 
587d1942b5 FindOpenCL: Add support for version 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7253
 2022-05-12 09:26:58 -04:00
Brad King
fdc9e9e4fa Merge topic 'vs-arm64-tests' 
834422e075 Tests: Fix test failures for Windows Arm64 platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7251
 2022-05-12 09:25:37 -04:00
Kitware Robot
f46c67de0e CMake Nightly Date Stamp 2022-05-12 00:01:04 -04:00
friendlyanon
a82163839a CMakePackageConfigHelpers: Fix note about version files supporting ranges 
In commit 55c3b6a77e (CMakePackageConfigHelpers: Relax restrictions on
version range, 2019-05-30, v3.20.0-rc1~295^2~1) the documentation for
write_basic_package_version_file documented the support of version
ranges by the generated version files, however the note wrongly
specifies a COMPATIBILITY_MODE argument, instead of COMPATIBILITY.
 2022-05-11 14:00:38 -04:00
Dmitry Kushpet
587d1942b5 FindOpenCL: Add support for version 3.0 2022-05-11 21:00:24 +03:00
Niyas Sait
834422e075 Tests: Fix test failures for Windows Arm64 platforms 2022-05-11 18:13:25 +01:00
Kitware Robot
364fde65ee CMake Nightly Date Stamp 2022-05-11 00:01:06 -04:00
Brad King
66aa34e529 Merge topic 'FindOpenSSL-qnx7.0' 
e6656381aa FindOpenSSL: Support version 1.1.1 under QNX 7.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7232
 2022-05-10 10:37:58 -04:00
Brad King
f43c54260b Merge topic 'stl-containers-helpers' 
95a1b2c7b8 stl containers: enhance compatibility with C++14, C++17 and C++20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7244
 2022-05-10 10:31:59 -04:00
Brad King
79b64690d9 Merge topic 'werror-property' 
76a08cd253 COMPILE_WARNING_AS_ERROR: Add options to treat warnings as errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !7187
 2022-05-10 10:30:42 -04:00
Brad King
54c3563e95 Merge topic 'watcom-runtime-library-v2' 
6a2b016bbd OpenWatcom: Support CMAKE_WATCOM_RUNTIME_LIBRARY with Linux and OS/2 builds
33da5824ac OpenWatcom: Allow specifying the runtime library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7184
 2022-05-10 10:27:15 -04:00
Kitware Robot
02b4cd9827 CMake Nightly Date Stamp 2022-05-10 00:01:04 -04:00
Kitware Robot
cf6235719b CMake Nightly Date Stamp 2022-05-09 00:01:15 -04:00
Kitware Robot
b541073a44 CMake Nightly Date Stamp 2022-05-08 00:01:04 -04:00
Marc Chevrier
95a1b2c7b8 stl containers: enhance compatibility with C++14, C++17 and C++20 
* Ensure various functions working with containers are available through
all headers as specified by the standard.
* Add C++20 std::ssize() function.
 2022-05-07 11:04:06 +02:00
Kitware Robot
ddfa4372f7 CMake Nightly Date Stamp 2022-05-07 00:01:12 -04:00