mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,954 Commits 2 Branches 401 Tags
e09ea00476b57096cebbd1e8d0c43fb288683080
Commit Graph

57954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King e09ea00476 Merge branch 'release-3.24' 2022-06-23 09:23:56 -04:00
Brad King 5d8289116d Merge topic 'vs-compile-batching' 
9a0a94fdaa VS: Add variable to to turn off Visual Studio compile batching
a7ebb73929 Help: Improve formatting in VS_NO_COMPILE_BATCHING docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7405
 2022-06-23 09:23:56 -04:00
Brad King fd83847b14 Merge topic 'vs-compile-batching' into release-3.24 
9a0a94fdaa VS: Add variable to to turn off Visual Studio compile batching
a7ebb73929 Help: Improve formatting in VS_NO_COMPILE_BATCHING docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7405
 2022-06-23 09:23:55 -04:00
Brad King 1208276f96 Merge branch 'release-3.24' 2022-06-23 09:21:26 -04:00
Brad King d1e2090526 Merge topic 'revert-pkgconfig-static-libs' 
7e4adcac82 FindPkgConfig: Revert "Populate _STATIC_LINK_LIBRARIES. Add STATIC_TARGET."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7402
 2022-06-23 09:21:26 -04:00
Brad King 46305219eb Merge topic 'revert-pkgconfig-static-libs' into release-3.24 
7e4adcac82 FindPkgConfig: Revert "Populate _STATIC_LINK_LIBRARIES. Add STATIC_TARGET."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7402
 2022-06-23 09:21:25 -04:00
Kitware Robot de7f39c2a6 CMake Nightly Date Stamp 2022-06-23 00:01:07 -04:00
Brad King 9a0a94fdaa VS: Add variable to to turn off Visual Studio compile batching 
Extend the change from commit b764c7c273 (VS: Add property to turn off
Visual Studio compile batching, 2022-02-07, v3.24.0-rc1~710^2) by
adding a variable to initialize the property on every target.

Issue: #23179
Fixes: #23639
 2022-06-22 12:07:03 -04:00
Brad King a7ebb73929 Help: Improve formatting in VS_NO_COMPILE_BATCHING docs 2022-06-22 11:59:55 -04:00
Brad King 7e4adcac82 FindPkgConfig: Revert "Populate _STATIC_LINK_LIBRARIES. Add STATIC_TARGET." 
Revert commit 020976d637 (FindPkgConfig: Populate
_STATIC_LINK_LIBRARIES. Add STATIC_TARGET., 2021-12-31,
v3.24.0-rc1~105^2).  Several regressions have been reported.
Revert the feature pending further discussion and design work.

Issue: #21714
Fixes: #23642
 2022-06-22 10:13:00 -04:00
Brad King 2be09731e0 Merge topic 'FindPython-registry-management' 
0201530bdb FindPython: enhance windows registry handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7384
 2022-06-22 09:03:12 -04:00
Brad King 9f3ca7ff4d Merge topic 'glew' 
a31b270785 FindGLEW: Set documented variables when found via upstream package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7390
 2022-06-22 09:01:10 -04:00
Brad King 9590669bb7 Merge branch 'release-3.24' 2022-06-22 08:50:28 -04:00
Brad King 47be79e382 Merge topic 'FetchContent-doc-example' 
641d97e03f FetchContent: Fix example code in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7393
 2022-06-22 08:50:27 -04:00
Brad King aae6a67e5c Merge topic 'FetchContent-doc-example' into release-3.24 
641d97e03f FetchContent: Fix example code in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7393
 2022-06-22 08:50:26 -04:00
Brad King 83f62cc15a Merge branch 'release-3.24' 2022-06-22 08:49:33 -04:00
Brad King 97c273161e Merge topic 'FindMPI-l-colon' 
a606609499 FindMPI: Parse '-l:' flags in pkg-config output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7392
 2022-06-22 08:49:32 -04:00
Brad King e38783f16b Merge topic 'FindMPI-l-colon' into release-3.24 
a606609499 FindMPI: Parse '-l:' flags in pkg-config output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7392
 2022-06-22 08:49:31 -04:00
Brad King e37b4c9ccd Merge branch 'release-3.24' 2022-06-22 08:48:33 -04:00
Brad King 07a0c0a12b Merge topic 'use-arm64-msbuild' 
80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7381
 2022-06-22 08:48:33 -04:00
Brad King dc67ae7cd3 Merge topic 'use-arm64-msbuild' into release-3.24 
80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7381
 2022-06-22 08:48:32 -04:00
Brad King a4df9babbb Merge branch 'release-3.24' 2022-06-22 08:47:38 -04:00
Brad King 52e9225e4f Merge topic 'xcode14' 
7c79fde5fb Xcode: automatically create Info.plist for signing during compiler id
116cc5a57b cm_cxx_features: filter out warnings from Xcode 14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7391
 2022-06-22 08:47:38 -04:00
Brad King 0b86798a53 Merge topic 'xcode14' into release-3.24 
7c79fde5fb Xcode: automatically create Info.plist for signing during compiler id
116cc5a57b cm_cxx_features: filter out warnings from Xcode 14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7391
 2022-06-22 08:47:37 -04:00
Brad King 01140ccb25 Merge branch 'release-3.24' 2022-06-22 08:46:32 -04:00
Brad King 2f3ea66a76 Merge topic 'ci-openal' 
b97d371007 ci: Add OpenAL to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7394
 2022-06-22 08:46:31 -04:00
Brad King 43009235c3 Merge topic 'ci-openal' into release-3.24 
b97d371007 ci: Add OpenAL to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7394
 2022-06-22 08:46:30 -04:00
Brad King 134109bc09 Merge branch 'release-3.24' 2022-06-22 08:43:48 -04:00
Brad King 418abf89f7 Merge branch 'release-3.23' 2022-06-22 08:43:46 -04:00
Brad King 271fdaea3a Merge branch 'release-3.23' into release-3.24 2022-06-22 08:43:37 -04:00
Brad King 485c076f37 Merge branch 'release-3.24' 2022-06-22 08:42:50 -04:00
Brad King 01ba9d3c39 Merge topic 'ExternalProject-stamp-cfgdir' 
6a1e45fdec Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir'
5022b42f8b ExternalProject: Fix regression in stamp creation for Xcode+iOS
7b622f3e80 ExternalProject: Fix regression in stamp creation for Xcode+iOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7396
 2022-06-22 08:42:50 -04:00
Brad King ab8bc1c986 Merge topic 'ExternalProject-stamp-cfgdir' into release-3.24 
6a1e45fdec Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir'
5022b42f8b ExternalProject: Fix regression in stamp creation for Xcode+iOS
7b622f3e80 ExternalProject: Fix regression in stamp creation for Xcode+iOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7396
 2022-06-22 08:42:49 -04:00
Brad King 8321c3d08e Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir' into release-3.23 
Merge-request: !7396
 2022-06-22 08:41:50 -04:00
Kitware Robot da27438883 CMake Nightly Date Stamp 2022-06-22 00:01:08 -04:00
Brad King 6a1e45fdec Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir' 2022-06-21 18:31:00 -04:00
Brad King 5022b42f8b ExternalProject: Fix regression in stamp creation for Xcode+iOS 
The change to `_ep_add_mkdir_command` in commit 5fbac2bb24
(ExternalProject: Move inline scripts to separate files, 2022-01-22,
v3.23.0-rc1~101^2) did not account for the possibility that
`CMAKE_CFG_INTDIR` is `$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)`
instead of just the configuration name.  Pass the value into the helper
script on the command line so that the native buildsystem placeholders
are evaluated.

Fixes: #23645
 2022-06-21 18:27:44 -04:00
Brad King 7b622f3e80 ExternalProject: Fix regression in stamp creation for Xcode+iOS 
The change to `_ep_add_mkdir_command` in commit 5fbac2bb24
(ExternalProject: Move inline scripts to separate files, 2022-01-22,
v3.23.0-rc1~101^2) did not account for the possibility that
`CMAKE_CFG_INTDIR` is `$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)`
instead of just the configuration name.  Pass the value into the helper
script on the command line so that the native buildsystem placeholders
are evaluated.

Fixes: #23645
 2022-06-21 18:26:22 -04:00
Marc Chevrier 0201530bdb FindPython: enhance windows registry handling 2022-06-21 22:52:02 +02:00
Markus Mützel a31b270785 FindGLEW: Set documented variables when found via upstream package 
When GLEW is found by `find_package` (most of) the variables described
in the documentation of `FindGLEW` aren't set.  That could lead to
issues when building packages that rely on these variables.

Fixes: #19662
 2022-06-21 13:56:29 -04:00
Markus Mützel a606609499 FindMPI: Parse '-l:' flags in pkg-config output 
With the msmpi package in MSYS2:

    $ pkg-config --libs msmpi
    -LC:/msys64/mingw64/lib -l:libmsmpi.dll.a

MSYS2-Issue: https://github.com/msys2/MINGW-packages/pull/11839
Fixes: #23620
 2022-06-21 12:38:30 -04:00
pigeon 641d97e03f FetchContent: Fix example code in documentation 2022-06-21 12:31:00 -04:00
Brad King b97d371007 ci: Add OpenAL to Debian and Fedora base images 2022-06-21 12:27:58 -04:00
Tommy Vercetti 80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host 
Fixes: #23629
 2022-06-21 10:56:42 -04:00
Gregor Jasny 7c79fde5fb Xcode: automatically create Info.plist for signing during compiler id 
Extend the Xcode 14 update from commit 89e1113e0c (Xcode: Use ad-hoc
signing during compiler id on macOS, 2022-06-10, v3.24.0-rc1~13^2~2).
 2022-06-21 10:49:45 -04:00
Gregor Jasny 116cc5a57b cm_cxx_features: filter out warnings from Xcode 14 
```
xcodebuild[13070:54426] [MT] DVTSDK: Warning: SDK path collision for path
```
 2022-06-21 10:48:37 -04:00
Brad King 8d8957e56d Merge topic 'add_export_no_system' 
9680b3b279 Add EXPORT_NO_SYSTEM target property, deprecate IMPORTED_NO_SYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7379
 2022-06-21 10:46:03 -04:00
Brad King b27c3700e6 Merge topic 'drhpc-findblas-pkgconfig' 
70f15d202f Modules/Find{BLAS,LAPACK}: allow choice of pkg-config package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7370
 2022-06-21 10:44:14 -04:00
Kitware Robot 45778c4f49 CMake Nightly Date Stamp 2022-06-21 00:01:11 -04:00
Brad King c93d3cf0b7 Merge branch 'release-3.24' 2022-06-20 09:57:23 -04:00