mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-14 19:20:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
53,928 Commits 2 Branches 390 Tags
3265fa51cd4feec492a157506fff505dbd4c7d37
Commit Graph

53928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
3265fa51cd Merge topic 'ctest-environment-modifications' 
de4f1f26b0 CTest: add an ENVIRONMENT_MODIFICATION property
4c757fa3c8 Help/prop_test/ENVIRONMENT: clarify the scope of the changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6299
 2021-07-13 08:24:36 -04:00
Brad King
95c97a12e8 Merge topic 'state-project-kind' 
6c440ea3ce cmake: Model normal and try-compile project kinds explicitly
2065bd73cb cmState: Construct with mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6337
 2021-07-13 08:23:18 -04:00
Brad King
48abfe9976 Merge topic 'UseSWIG-dependencies-VS-generators' 
d1bece92d5 UseSWIG: Use swig generated dependencies for Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6327
 2021-07-13 08:22:28 -04:00
Brad King
18b3568018 Merge topic 'ctest-libuv-exe-network-path' 
113cc4c684 libuv: Allow windows UNC path with forward slashes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6330
 2021-07-13 08:21:25 -04:00
Brad King
8fcd3ecb2a Merge topic 'vs-CMAKE_MSVCIDE_RUN_PATH' 
542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6334
 2021-07-13 08:20:36 -04:00
Brad King
f16cf13c12 Merge branch 'release-3.21' 2021-07-13 08:18:32 -04:00
Brad King
235795d502 Merge topic 'file-grd-arch' 
5aeda18297 file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionally
17aa96bb7a Merge branch 'master' into file-grd-arch
b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6339
 2021-07-13 08:18:32 -04:00
Brad King
00e8292434 Merge topic 'file-grd-arch' into release-3.21 
b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6339
 2021-07-13 08:18:32 -04:00
Brad King
6b1ea29a97 Merge branch 'release-3.21' 2021-07-13 08:17:30 -04:00
Brad King
49e1fdaf0e Merge topic 'doc-preset-example-v3' into release-3.21 
2114d717a0 Help: Fix preset example cmakeMinimumRequired

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6333
 2021-07-13 08:17:30 -04:00
Brad King
c94ff1f75f Merge topic 'doc-preset-example-v3' 
2114d717a0 Help: Fix preset example cmakeMinimumRequired

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6333
 2021-07-13 08:17:30 -04:00
Brad King
6953414d48 Merge branch 'release-3.21' 2021-07-13 08:16:27 -04:00
Brad King
27d248a784 Merge topic 'cpack-deb-post-ops' into release-3.21 
805fa791d1 CPack/DEB: Avoid overriding user-provided `postinst` and `postrm`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6335
 2021-07-13 08:16:26 -04:00
Brad King
ca85c6913d Merge topic 'cpack-deb-post-ops' 
805fa791d1 CPack/DEB: Avoid overriding user-provided `postinst` and `postrm`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6335
 2021-07-13 08:16:26 -04:00
Brad King
ae5d100e2f Merge branch 'release-3.21' 2021-07-13 08:15:07 -04:00
Brad King
9b12ffc1e8 Merge topic 'FindBLAS-LAPACK-All' 
31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK
57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6336
 2021-07-13 08:15:07 -04:00
Brad King
0698c156ec Merge topic 'FindBLAS-LAPACK-All' into release-3.21 
31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK
57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6336
 2021-07-13 08:15:06 -04:00
Kitware Robot
15bd593f4f CMake Nightly Date Stamp 2021-07-13 00:01:11 -04:00
Alex Turbov
805fa791d1 CPack/DEB: Avoid overriding user-provided postinst and postrm 
When a user provides `CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA` or
`CPACK_DEBIAN_<comp>_PACKAGE_CONTROL_EXTRA` variables in
`CMakeLists.txt` and the package contains dynamic libraries, the
`CPackDeb.cmake` sets `CPACK_ADD_LDCONFIG_CALL` to `1`.  Later it
analyzes if defaulted `postinst`/`postrm` should be generated trying to
check if the user provides any in `CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA`
variable. However, the `foreach` loop uses the invalid variable
`PACKAGE_CONTROL_EXTRA` instead, so these files gonna be overridden.
Fix the variable name.

Fixes: #22410
 2021-07-12 17:04:29 -04:00
Kyle Edwards
5aeda18297 file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionally 
Starting with CMake 3.22, cmELF.h is always available, so use it
unconditionally.
 2021-07-12 16:12:52 -04:00
Kyle Edwards
17aa96bb7a Merge branch 'master' into file-grd-arch 2021-07-12 16:12:46 -04:00
Kyle Edwards
b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies 
Fixes: #22106
 2021-07-12 16:11:38 -04:00
Brad King
6c440ea3ce cmake: Model normal and try-compile project kinds explicitly 
Construct with the project kind instead of mutating state after
construction.
 2021-07-12 12:21:52 -04:00
Brad King
2065bd73cb cmState: Construct with mode 2021-07-12 12:21:44 -04:00
earnal
113cc4c684 libuv: Allow windows UNC path with forward slashes 
Fix libuv issue 3159 in CMake while integration in upstream libuv is
pending.

Fixes: #22141
 2021-07-12 11:24:29 -04:00
Asit Dhal
542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH 
Do not require a language to be enabled.

Fixes: #22343
 2021-07-12 11:19:01 -04:00
Brad King
31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK 
Issue: #22403
 2021-07-12 11:11:37 -04:00
Brad King
57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested 
Logic added by commit 4c74c86f40 (FindBLAS/LAPACK: Add support for the
Fujitsu SSL2 library, 2021-01-27, v3.21.0-rc1~402^2~1) accidentally
expressed a boolean condition without proper grouping.  The pattern was
then copied by commit 2c9e623e31 (Find{BLAS,LAPACK}: Add support for the
NVHPC LAPACK library, 2021-05-05, v3.21.0-rc1~192^2).  The resulting
logic incorrectly tries Fujitsu and NVHPC vendors even after results are
found from another vendor, and then erases those.  Fix the grouping.

Fixes: #22403
 2021-07-12 11:08:05 -04:00
Sérgio Martins
2114d717a0 Help: Fix preset example cmakeMinimumRequired 
Since commit 8bc5c8961e (CMakePresets.json: Add the ability to
conditionally disable presets, 2021-03-10, v3.21.0-rc1~464^2)
the example requires presets version 3 support, which is not
available until CMake 3.21.  CMake 3.20.0 can't open v3 presets.
Make cmakeMinimumRequired compatible with the example's version.
 2021-07-12 08:54:04 -04:00
Brad King
c9cd039e5f Merge topic 'LWYU-externalization' 
14e57e9637 LINK_WHAT_YOU_USE feature: externalize configuration
9c5132a586 PGI: Fix "LINKER:" prefix generated separator
8a93de080c cmGeneratorTarget: Add method for LINKER: prefix translation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6306
 2021-07-12 08:43:32 -04:00
Brad King
2d830247ba Merge topic 'cpack-rpm-requires-exclude-from' 
bb5fc38209 CPack/RPM: Add option to set %global __requires_exclude_from

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6324
 2021-07-12 08:42:03 -04:00
Brad King
ca696c73e1 Merge topic 'target-stable-order' 
9e9ab61e2f cmGlobalGenerator: Process targets in a stable order
8a812dde61 cmGlobalGenerator: Use cmMakefile::CreateNewTarget to add global targets
854dcb0d01 cmMakefile: Split out CreateNewTarget from AddNewTarget

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6267
 2021-07-12 08:39:46 -04:00
Brad King
a24bd73e6e Merge branch 'release-3.21' 2021-07-12 08:35:21 -04:00
Brad King
ac984cb5f7 Merge branch 'release-3.20' into release-3.21 2021-07-12 08:35:15 -04:00
Brad King
1851032952 Merge branch 'release-3.20' 2021-07-12 08:34:57 -04:00
Brad King
5df2c45854 Merge topic 'intel-oneapi-std-windows' into release-3.21 
a82af0e2ce Merge branch 'backport-3.20-intel-oneapi-std-windows'
1c227583a4 Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode
1c14691a86 CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
6eea123e3a Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6328
 2021-07-12 08:33:31 -04:00
Brad King
a3a82f1851 Merge branch 'release-3.21' 2021-07-12 08:33:31 -04:00
Brad King
89b61d9197 Merge topic 'intel-oneapi-std-windows' 
a82af0e2ce Merge branch 'backport-3.20-intel-oneapi-std-windows'
1c227583a4 Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode
1c14691a86 CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
6eea123e3a Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6328
 2021-07-12 08:33:31 -04:00
Brad King
79ca88ccd8 Merge topic 'FindJPEG-revert-turbo' into release-3.21 
0de1f1503b FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6326
 2021-07-12 08:32:18 -04:00
Brad King
18a6f8fd58 Merge branch 'release-3.21' 2021-07-12 08:32:18 -04:00
Brad King
ac9353f960 Merge topic 'FindJPEG-revert-turbo' 
0de1f1503b FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6326
 2021-07-12 08:32:18 -04:00
Brad King
734484bfbc Merge topic 'ci-hip' 
71ab24015f gitlab-ci: add job testing hip4.2 with Ninja Multi-Config
2e124fa22d ci: add hip4.2 base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6329
 2021-07-12 08:30:46 -04:00
Kitware Robot
52a73d1654 CMake Nightly Date Stamp 2021-07-12 00:01:19 -04:00
Kitware Robot
3c521b89f1 CMake Nightly Date Stamp 2021-07-11 00:01:06 -04:00
Kitware Robot
4f5957d72d CMake Nightly Date Stamp 2021-07-10 00:01:09 -04:00
Brad King
71ab24015f gitlab-ci: add job testing hip4.2 with Ninja Multi-Config 2021-07-09 13:48:28 -04:00
Brad King
2e124fa22d ci: add hip4.2 base image 2021-07-09 13:35:05 -04:00
Brad King
9029335b52 Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20 
Merge-request: !6328
 2021-07-09 11:45:00 -04:00
Brad King
a82af0e2ce Merge branch 'backport-3.20-intel-oneapi-std-windows' 2021-07-09 11:32:54 -04:00
Marc Chevrier
d1bece92d5 UseSWIG: Use swig generated dependencies for Visual Studio 2021-07-09 17:31:20 +02:00