mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 10:39:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,691 Commits 2 Branches 401 Tags
185723461f02872987de862ecfcb5ec32e6ecde6
Commit Graph

56691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Würth 185723461f FindZLIB: more library names + option to prefer static library 
Adds additional library names `zlibstat[d]` and `zlibvc[d]` for Windows,
when zlib is built using one of the Visual Studio solutions under
`zlib/contrib/vstudio`.

Adds a `ZLIB_USE_STATIC_LIBS` option that is equivilent to similar
settings in other modules such as FindProtobuf, FindOpenSSL, etc.

Implements #18029 and #23140
 2022-03-12 17:55:57 +01:00
Kitware Robot de52151359 CMake Nightly Date Stamp 2022-03-12 00:01:19 -05:00
Brad King 96b7ca3576 Merge topic 'find_package-global-imported' 
2f1ffa003c find_package: Add support for default GLOBAL imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6862
 2022-03-11 08:54:36 -05:00
Brad King edee7c18e8 Merge topic 'cuda-arch-native' 
d1b48bfabd CUDA: Add support for CUDA_ARCHITECTURES=native
632752d62e CUDA: Add FIXME comments about deferring architecture testing
45e9ab0372 Tests: Rename CudaOnly.{All => ArchSpecial}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7050
 2022-03-11 08:53:25 -05:00
Brad King 34c25f6451 Merge topic 'FindX11-xcb-components' 
ce28748ced FindX11: add xcb-xtest and xcb-keysyms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7052
 2022-03-11 08:50:07 -05:00
Brad King 67f23f5f4e Merge topic 'test-fix-regex' 
5059db7c17 Tests: Fix CMake syntax warning in RunCMake.CTestCommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Frank Winklmeier <frank.winklmeier@cern.ch>
Merge-request: !7062
 2022-03-11 08:43:46 -05:00
Kitware Robot d8f95471c7 CMake Nightly Date Stamp 2022-03-11 00:01:17 -05:00
John Parent 2f1ffa003c find_package: Add support for default GLOBAL imported targets 
Allow find package to promote scope of imported targets by specifying
an argument to `find_package` or by specifying a CMake variable.
    * Add support for CMAKE_GLOBAL_IMPORT_SCOPE variable
    * Add support for GLOBAL argument to find_package

Additionally add testing for above features.
 2022-03-10 12:44:36 -05:00
planc ce28748ced FindX11: add xcb-xtest and xcb-keysyms 2022-03-10 11:41:31 -05:00
Brad King 3a37fda6a2 Merge branch 'release-3.23' 2022-03-10 10:04:35 -05:00
Brad King d1b48bfabd CUDA: Add support for CUDA_ARCHITECTURES=native 
CUDA 11.6 added the `nvcc -arch=native` flag to automatically compile
for the host GPUs' architectures.  Add support for specifying this
special `native` value in `CMAKE_CUDA_ARCHITECTURES` and
`CUDA_ARCHITECTURES`.  During the compiler ABI detection step,
detect the native architectures so we can pass them explicitly
when using Clang or older versions of nvcc.

Fixes: #22375
 2022-03-10 09:27:29 -05:00
Brad King 632752d62e CUDA: Add FIXME comments about deferring architecture testing 
Issue: #23161
 2022-03-10 09:26:13 -05:00
Brad King 45e9ab0372 Tests: Rename CudaOnly.{All => ArchSpecial} 
The purpose of the test is to cover special values of
`CMAKE_CUDA_ARCHITECTURES`.  Prepare to add more than
just `all` and `all-major`.

While at it, fix the `project()` name in the test to
match what we pass to `ctest` with `--build-project`.
 2022-03-10 09:26:13 -05:00
Brad King 736e80dbca CMake 3.23.0-rc3 v3.23.0-rc3 2022-03-10 09:11:13 -05:00
Brad King 4a2300923b Merge branch 'release-3.23' 2022-03-10 09:08:05 -05:00
Brad King d4f12c2097 Merge topic 'cuda-arch-off' 
7024596a26 Tests: Fix testing CMAKE_CUDA_ARCHITECTURES=OFF with Clang
2a79b647fa CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7058
 2022-03-10 09:08:05 -05:00
Brad King ed663af8a2 Merge topic 'cuda-arch-off' into release-3.23 
7024596a26 Tests: Fix testing CMAKE_CUDA_ARCHITECTURES=OFF with Clang
2a79b647fa CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7058
 2022-03-10 09:08:04 -05:00
Brad King ab5baa32ad Merge topic 'ctest-WORKING_DIRECTORY' 
a116fd413d ctest: print WORKING_DIRECTORY property with -V

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7060
 2022-03-10 08:39:33 -05:00
Brad King 5059db7c17 Tests: Fix CMake syntax warning in RunCMake.CTestCommandLine 
Fix a regex added in the test by commit 140704d443 (ctest: add option
for output truncation, 2022-03-07).
 2022-03-10 08:05:56 -05:00
Brad King 7024596a26 Tests: Fix testing CMAKE_CUDA_ARCHITECTURES=OFF with Clang 
Clang does not automatically choose an architecture supported
by the SDK.  The `OFF` value is meant for users to provide their
own architecture flags, so provide one as part of the test.
 2022-03-10 07:10:38 -05:00
Brad King f409296c53 Merge branch 'release-3.23' 2022-03-10 06:44:49 -05:00
Brad King c31f7de574 Merge branch 'release-3.22' into release-3.23 2022-03-10 06:44:26 -05:00
Brad King f0d0d5e9cb Merge branch 'release-3.23' 2022-03-10 06:43:11 -05:00
Brad King 8a5e16070d Merge topic 'irsl-oneapi-linux' 
3e84a06b3a IRSL: Add paths for Intel oneAPI compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7057
 2022-03-10 06:43:11 -05:00
Brad King e3b9338e97 Merge topic 'irsl-oneapi-linux' into release-3.23 
3e84a06b3a IRSL: Add paths for Intel oneAPI compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7057
 2022-03-10 06:43:10 -05:00
Brad King 3f200bb0c8 Merge branch 'release-3.23' 2022-03-10 06:33:56 -05:00
Brad King 7ada318350 Merge topic 'ci-msvc-19.31' 
f2c303f4c7 Merge branch 'backport-3.22-ci-msvc-19.31' into ci-msvc-19.31
e66de43180 gitlab-ci: Update Windows builds to MSVC 19.31 toolset
fade5b5b8c gitlab-ci: Update Windows builds to MSVC 19.31 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7059
 2022-03-10 06:33:56 -05:00
Brad King ae585bdc12 Merge topic 'ci-msvc-19.31' into release-3.23 
f2c303f4c7 Merge branch 'backport-3.22-ci-msvc-19.31' into ci-msvc-19.31
e66de43180 gitlab-ci: Update Windows builds to MSVC 19.31 toolset
fade5b5b8c gitlab-ci: Update Windows builds to MSVC 19.31 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7059
 2022-03-10 06:33:55 -05:00
Kitware Robot a90849d3ef CMake Nightly Date Stamp 2022-03-10 00:01:21 -05:00
Kevin Puetz a116fd413d ctest: print WORKING_DIRECTORY property with -V 2022-03-09 13:00:01 -06:00
Brad King dfdcb4fc3d Merge branch 'backport-3.22-ci-msvc-19.31' into release-3.22 
Merge-request: !7059
 2022-03-09 12:59:55 -05:00
Brad King 90a9bff01e Merge branch 'irsl-oneapi-linux' into release-3.22 
Merge-request: !7057
 2022-03-09 12:58:09 -05:00
Attila Krasznahorkay 3e84a06b3a IRSL: Add paths for Intel oneAPI compilers on Linux 
They are stored in a slightly different place with oneAPI than they
used to be in PSXE.

A similar change was made for Windows by commit 956160bb9a (IRSL: Fix
search for Windows redist files with Intel Classic compiler, 2021-09-23,
v3.22.0-rc1~88^2), which left a comment about the locations relative to
the Classic and oneAPI compilers.

Fixes: #23310
 2022-03-09 12:53:37 -05:00
Robert Maynard 2a79b647fa CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFF 
Fixes: #23309
 2022-03-09 12:30:12 -05:00
Brad King cbd36eac23 Merge topic 'ctest_truncate' 
140704d443 ctest: add option for output truncation
359e5b17d8 presets: bump version to v5
4634de335b cmCTestTestHandler: refactor CleanTestOutput method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6993
 2022-03-09 12:17:44 -05:00
Brad King 51e81d1f73 Merge topic 'color-diagnostics' 
6ab9fbd43b color: Add tests for CMAKE_COLOR_DIAGNOSTICS
78adb1b952 color: Add CMAKE_COLOR_DIAGNOSTICS environment variable
884d9de8b7 color: Introduce CMAKE_COLOR_DIAGNOSTICS variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Frank Dana <ferdnyc@gmail.com>
Merge-request: !6990
 2022-03-09 12:15:53 -05:00
Brad King 4802b27e64 Merge topic 'FindX11--xcb-randr' 
364798fa6b FindX11: Add xcb_randr library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7046
 2022-03-09 12:14:16 -05:00
Brad King 85a82a3dee Merge branch 'release-3.23' 2022-03-09 12:12:31 -05:00
Brad King fda8030156 Merge branch 'release-3.22' 2022-03-09 12:12:30 -05:00
Brad King bdebc5a7c3 Merge branch 'release-3.21' 2022-03-09 12:12:27 -05:00
Brad King 1aa51fb9e3 Merge branch 'release-3.22' into release-3.23 2022-03-09 12:12:01 -05:00
Brad King 81bf51e63b Merge branch 'release-3.23' 2022-03-09 12:11:07 -05:00
Brad King 4d21c9e43e Merge topic 'ignore-prefix-path-test-program-path' 
11ea24e590 Tests: Disable CMAKE_SYSTEM_PROGRAM_PATH in IgnorePrefixPath test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7055
 2022-03-09 12:11:07 -05:00
Brad King 04d42cb908 Merge topic 'ignore-prefix-path-test-program-path' into release-3.23 
11ea24e590 Tests: Disable CMAKE_SYSTEM_PROGRAM_PATH in IgnorePrefixPath test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7055
 2022-03-09 12:11:06 -05:00
Brad King 45e659eff6 Merge branch 'release-3.23' 2022-03-09 12:10:16 -05:00
Brad King 28da3780c7 Merge topic 'binutils-llvm-mt' 
73d0d4e4b5 BinUtils: Avoid llvm-mt because it is missing 'mt' features we use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7054
 2022-03-09 12:10:15 -05:00
Brad King 0402d35168 Merge topic 'binutils-llvm-mt' into release-3.23 
73d0d4e4b5 BinUtils: Avoid llvm-mt because it is missing 'mt' features we use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7054
 2022-03-09 12:10:14 -05:00
Brad King 3884bfecbf Merge branch 'release-3.23' 2022-03-09 12:09:04 -05:00
Brad King a7474dac87 Merge topic 'iar-cmp0057' 
bd3e23a605 IAR: Fix detection of modern C++ version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7053
 2022-03-09 12:09:03 -05:00
Brad King 5b29664e58 Merge topic 'iar-cmp0057' into release-3.23 
bd3e23a605 IAR: Fix detection of modern C++ version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7053
 2022-03-09 12:09:02 -05:00