mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,469 Commits 2 Branches 401 Tags
a7cd15a61c5708ba50482ee485b4c102146861d0
Commit Graph

57469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King a7cd15a61c Merge topic 'try_compile-project-platform-vars' 
a6562ff579 try_compile: Add option to skip passing platform variables
4843a37676 try_compile: Propagate platform variables in project-mode too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7265
 2022-05-17 08:57:55 -04:00
Brad King 20ed6f697e Merge topic 'update-curl' 
71747a28ea Merge branch 'upstream-curl' into update-curl
9d8f81f4f8 curl 2022-05-11 (462196e6)
02902188ec curl: Update script to get curl 7.83.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7267
 2022-05-17 08:52:48 -04:00
Brad King e561e29e04 Merge topic 'findzlib-static' 
3f0b9663a4 FindZLIB: fix ZLIB_USE_STATIC_LIBS on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7262
 2022-05-17 08:52:09 -04:00
Brad King 2adfa82e28 Merge topic 'install-all-components-fix' 
b0c8e31b54 install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7263
 2022-05-17 08:50:33 -04:00
Brad King 37cdf215ac Merge branch 'release-3.23' 2022-05-17 08:48:55 -04:00
Brad King f2eb9d645f Merge branch 'release-3.22' 2022-05-17 08:48:53 -04:00
Brad King 5b3096198a Merge branch 'release-3.22' into release-3.23 2022-05-17 08:48:45 -04:00
Brad King 42dd6eabd4 Merge branch 'release-3.23' 2022-05-17 08:47:32 -04:00
Brad King 2ef9865f09 Merge topic 'FortranCInterface-gcc12' 
cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7266
 2022-05-17 08:47:31 -04:00
Brad King e05a476700 Merge topic 'FortranCInterface-gcc12' into release-3.23 
cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7266
 2022-05-17 08:47:30 -04:00
Brad King 334c3cd435 Merge topic 'ci-intel-compiler' 
cb3feb1efe gitlab-ci: add jobs testing Intel 2022.1.0 compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7270
 2022-05-17 08:46:20 -04:00
Kitware Robot 943210856a CMake Nightly Date Stamp 2022-05-17 00:01:08 -04:00
Brad King cb3feb1efe gitlab-ci: add jobs testing Intel 2022.1.0 compilers on Linux 
Note that the classic compiler version is 2021.6.0, but we still
have it in the 2022.1.0 base image.
 2022-05-16 17:29:16 -04:00
Brad King 71747a28ea Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-05-11 (462196e6)
 2022-05-16 11:43:51 -04:00
Curl Upstream 9d8f81f4f8 curl 2022-05-11 (462196e6) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f (curl-7_83_1).
 2022-05-16 11:43:24 -04:00
Brad King 02902188ec curl: Update script to get curl 7.83.1 2022-05-16 11:43:15 -04:00
Brad King 4a9e2a1572 Merge branch 'FortranCInterface-gcc12' into release-3.22 
Merge-request: !7266
 2022-05-16 11:19:29 -04:00
Brad King cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang 
The C flags added by commit 6a0ce19ce1 (FortranCInterface: Fix
compatibility with GCC gfortran 12 LTO, 2022-01-19, v3.22.2~5^2)
should only be added for the GNU C compiler.

Fixes: #23500
Issue: #23123
 2022-05-16 11:18:00 -04:00
Brad King a6562ff579 try_compile: Add option to skip passing platform variables 
Add a `CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES` variable to tell
`try_compile` not to pass platform variables to the test project.

Issue: #23219
 2022-05-16 10:47:21 -04:00
Brad King 4843a37676 try_compile: Propagate platform variables in project-mode too 
Add policy CMP0137 to propagate both our builtin variables and those
listed by `CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` to `try_compile`
whole-project builds.

Inspired-by: Alexander Neumann <Alexander.Neumann@hamburg.de>
Fixes: #23219
 2022-05-16 10:39:42 -04:00
Nils Gladitz b0c8e31b54 install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTS 
Fixes: #23494
 2022-05-16 09:34:31 -04:00
Brad King c4ed5341c4 Merge topic 'CMAKE_PROJECT_TOP_LEVEL_INCLUDES' 
a6c34b0353 project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection point
8aa29a1793 CMakeDetermineSystem: Remove unreachable code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7250
 2022-05-16 09:26:59 -04:00
Brad King 1dd7430495 Merge topic 'test-clang-15' 
91987aec24 Tests: Add missing return types to C function prototypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7260
 2022-05-16 09:26:16 -04:00
Brad King e924d3780b Merge branch 'release-3.23' 2022-05-16 09:24:53 -04:00
Brad King a9a93b1e33 Merge topic 'cuda-arch-off-vs' 
9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7261
 2022-05-16 09:24:53 -04:00
Brad King 29d23ec2cf Merge topic 'cuda-arch-off-vs' into release-3.23 
9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7261
 2022-05-16 09:24:52 -04:00
Craig Scott 7a390edefb Merge topic 'fetchcontent-subbuild-config-type' 
10865c8e5f FetchContent: Hard-code a config for the sub-build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7228
 2022-05-16 07:33:35 -04:00
Kitware Robot c51d9550e7 CMake Nightly Date Stamp 2022-05-16 00:01:14 -04:00
Kitware Robot dc3d0b5a0a CMake Nightly Date Stamp 2022-05-15 00:01:08 -04:00
Kitware Robot de57770901 CMake Nightly Date Stamp 2022-05-14 00:01:08 -04:00
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 9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF 
If we add no CUDA architecture flags, write an empty `CodeGeneration`
field to tell the CUDA Toolkit's VS integration not to add its default
flags.  We already use this approach for `CMAKE_CUDA_ARCHITECTURES=all`
so that the `-arch=all` flag can be added via `AdditionalOptions`.

Fixes: #23490
 2022-05-13 11:34:51 -04:00
Brad King 91987aec24 Tests: Add missing return types to C function prototypes 
These were diagnosed by a Clang 15 development version.
 2022-05-13 11:07:17 -04: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