mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 01:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
63,142 Commits 2 Branches 401 Tags
6576ca15f656459becccb1cdcde18c707e2ab339
Commit Graph

3184 Commits

Author SHA1 Message Date
Brad King 6576ca15f6 Merge topic 'mingw-search-prefixes' 
5e5132e1b1 MinGW: Search for packages in standard MSYSTEM environment prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8796
 2023-09-14 12:50:41 -04:00
Brad King 5e5132e1b1 MinGW: Search for packages in standard MSYSTEM environment prefixes 
MSYS2 and similar MinGW/MSYS distributions define development
environments with a `MSYSTEM` environment variable.  Each such
environment has a documented installation prefix for its packages,
often provided by a `MSYSTEM_PREFIX` environment variable.
Since commit 84a25fc263 (cmake_host_system_information: Add
MSYSTEM_PREFIX query, 2023-09-08) we can look up this prefix.

Add `$MSYSTEM_PREFIX/local` and `$MSYSTEM_PREFIX` to our system search
prefixes when targeting MinGW under `MSYSTEM` environments.  This is
their equivalent to `/usr/local` and `/usr`, which we search by default
on UNIX systems.

Issue: #24216
 2023-09-13 08:35:59 -04:00
Brad King 976659c846 Merge topic 'presets-schema' 
f1a7179520 presets: Add $schema property to JSON schema
f83771dfce presets: Add missing spaces in JSON schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8777
 2023-09-12 09:08:17 -04:00
ChenMoFeiJin f1a7179520 presets: Add $schema property to JSON schema 
Many modern code editors have support for JSON Schema.  When you specify
the `$schema` property in a JSON file, the editor can provide features
like auto-completion, error checking, etc., which can improve your
efficiency when writing and modifying the `CMakePresets.json` file.
 2023-09-12 18:18:37 +08:00
Brad King 84a25fc263 cmake_host_system_information: Add MSYSTEM_PREFIX query 
Add a query on Windows hosts for the installation prefix of a
MSYS or MinGW development environment.

Issue: #24216
 2023-09-10 07:33:47 -04:00
Gregor Jasny b78a14e204 Xcode: reject legacy buildsystem for Xcode 14 
With Xcode 14 support for the Legacy Build System has been removed
and the BuildSystemType in the WorkspaceSettings is ignored.
If CMake still generates projects targeted to the Lecacy Build
System the build preparation phase will likely fail because Xcode
for example misses any declared outputs from script invocations.

This is a hard to debug problem and CMake should reject the invalid
configuration instead.
 2023-08-31 10:13:57 +02:00
Brad King 72beefa91b Merge branch 'release-3.27' 2023-08-23 09:53:31 -04:00
Brad King c3977582b7 CMake 3.27.4 2023-08-23 09:25:28 -04:00
Brad King ef2bab7687 Utilities/Release: Update docker specs for linux-x86_64 to centos 7 
Update the centos base image from centos 6 to centos 7.  The latter is
the minimum version supported by libuv 1.45.  The resulting binaries
require GLIBC 2.17.
 2023-08-16 14:29:55 -04:00
Brad King a705eb963c Merge branch 'release-3.27' 2023-08-16 14:16:14 -04:00
Brad King a69c783749 CMake 3.27.3 2023-08-16 13:46:35 -04:00
Chris Mahoney bc43398e72 ExternalProject: Enable Make Job Server with Explicit Build Command 
Introduces `BUILD_JOB_SERVER_AWARE` option to `ExternalProject_Add` and
`JOB_SERVER_AWARE` to `ExternalProject_Add_Step`. When using an explicit
`BUILD_COMMAND` or `COMMAND`, the generated commands won't use `$(MAKE)`
thus failing to connect to the outer make's job server. These new
options enable explicit job server integration.

Co-authored-by: Brad King <brad.king@kitware.com>

Fixes: #16273
 2023-08-15 12:21:30 +00:00
Kyle Edwards 2eab65ca82 Merge topic 'test-properties-directory' 
2ccb897d86 get_test_property(): Add DIRECTORY option
84e76fedb0 get_property(TEST): Add DIRECTORY option
efc8f19cc5 set_tests_properties(): Add DIRECTORY option
753999d4db set_property(TEST): Add DIRECTORY option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8709
 2023-08-14 11:18:54 -04:00
Kyle Edwards 0d95b68bd8 Merge topic 'ctest-generate-resource-spec-file' 
c8c1dd0d95 CTest: Add ability to dynamically generate resource spec file
3f5a5a5856 cmCTestRunTest::StartFailure(): Add total argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8699
 2023-08-14 11:18:03 -04:00
Kyle Edwards 2ccb897d86 get_test_property(): Add DIRECTORY option 2023-08-11 10:50:52 -04:00
Kyle Edwards 84e76fedb0 get_property(TEST): Add DIRECTORY option 2023-08-11 10:50:52 -04:00
Kyle Edwards efc8f19cc5 set_tests_properties(): Add DIRECTORY option 2023-08-11 10:50:52 -04:00
Kyle Edwards 753999d4db set_property(TEST): Add DIRECTORY option 2023-08-10 17:36:14 -04:00
Kyle Edwards c8c1dd0d95 CTest: Add ability to dynamically generate resource spec file 
Issue: #25106
 2023-08-10 16:47:51 -04:00
Brad King d5118ed2e5 Merge branch 'backport-vs-sdk-selection' into vs-sdk-selection 2023-08-10 10:00:53 -04:00
Brad King 89b611ab32 VS: Select latest Windows SDK even when targeting Windows 8.1 and below 
The policy added by commit f90c8ab54e (VS: Select latest available
Windows SDK version by default, 2023-04-03, v3.27.0-rc1~206^2~1) applied
only when targeting Windows 10+.  Apply it to older versions too.

Fixes: #25170
Issue: #16202
 2023-08-10 09:59:25 -04:00
Brad King ae97d82e83 VS: Teach CMAKE_GENERATOR_PLATFORM to support Windows 8.1 SDK selection 
Honor an explicit `version=8.1` field value regardless of the Windows
target version.

Issue: #25170
 2023-08-10 09:57:00 -04:00
Brad King 4776a584ad Help: Add 3.27 release note on VS default SDK selection 
This was accidentally left out of commit f90c8ab54e (VS: Select latest
available Windows SDK version by default, 2023-04-03,
v3.27.0-rc1~206^2~1).

Issue: #16202
 2023-08-08 20:35:02 -04:00
Brad King 17dcd9424a Merge topic 'xcode-embed-resources' 
e40d2cb3af Xcode: Add embed resources support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Deal <halx99@live.com>
Merge-request: !8632
 2023-08-01 09:33:15 -04:00
halx99 e40d2cb3af Xcode: Add embed resources support 2023-07-31 09:08:10 +08:00
Kyle Edwards 9bf8f7de06 find_library(): Add support for .xcframework 
Issue: #21752
 2023-07-28 14:41:45 -04:00
Kyle Edwards 7050ac56a1 macOS: Add support for linking against .xcframework folders 
Issue: #21752
 2023-07-26 17:00:01 -04:00
Kyle Edwards 8129bf85ed Merge topic 'exec-program-policy' 
ff12a57d5e exec_program(): Remove by policy CMP0153

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8653
 2023-07-26 09:23:32 -04:00
Brad King 9a28882fa6 Merge branch 'release-3.27' 2023-07-25 14:39:05 -04:00
Brad King b5c54d9c8a CMake 3.27.1 2023-07-25 13:58:09 -04:00
Kyle Edwards ff12a57d5e exec_program(): Remove by policy CMP0153 2023-07-25 11:09:56 -04:00
Brad King 4c9b0fe432 Merge topic 'deprecate-install-combined' 
7d3eede923 Help: Document IOS_INSTALL_COMBINED as deprecated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8641
 2023-07-21 09:39:21 -04:00
Márton Marczell 7d3eede923 Help: Document IOS_INSTALL_COMBINED as deprecated 
The approach has not made sense since the introduction of Apple Silicon
and macOS arm64.

Issue: #24957
 2023-07-20 11:21:24 -04:00
Brad King 88c6dc75ba Merge topic 'command-job-server-aware' 
95941fd990 add_custom_{target,command}: Add argument JOB_SERVER_AWARE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8547
 2023-07-20 10:23:31 -04:00
Brad King f0e74de429 Merge branch 'release-3.26' 2023-07-19 14:40:30 -04:00
Brad King 8ea4a99d28 Merge branch 'release-3.26' into release-3.27 2023-07-19 14:40:17 -04:00
Brad King 01c62f4ff0 CMake 3.26.5 2023-07-19 13:56:04 -04:00
Brad King b0054dd65c Merge topic 'imported-implib-only' 
7351d590ee cmTarget: Add a way to represent imported shared library stubs
83574a4772 GeneratorExpression: Expand testing of imported location resolution
b75ff51947 Testing: Map RelWithDebInfo config in GeneratorExpression test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !8582
 2023-07-19 10:55:30 -04:00
Chris Mahoney 95941fd990 add_custom_{target,command}: Add argument JOB_SERVER_AWARE 
Issue: #16273
 2023-07-19 10:45:33 -04:00
Robert Maynard 7351d590ee cmTarget: Add a way to represent imported shared library stubs 
Shared library stubs can be used for linking, but not at runtime.
Their role is similar to import libraries on Windows, so represent
their location with the `IMPORTED_IMPLIB` target property.

Fixes: #24940
 2023-07-18 13:21:01 -04:00
Brad King 052c76d54d Merge topic 'doc-genex-TARGET_IMPORT_FILE' 
69bc89758f Help: Fix typos, formatting and wording for TARGET_IMPORT_FILE genexes
9c0c844fbd Help: Add TARGET_IMPORT_FILE... genexes to 3.27 release notes
88277d15e7 Help: Add missing versionadded for TARGET_IMPORT_FILE_DIR genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8625
 2023-07-13 08:35:17 -04:00
Craig Scott 9c0c844fbd Help: Add TARGET_IMPORT_FILE... genexes to 3.27 release notes 
Fixes: #25060
 2023-07-13 09:27:28 +10:00
Gregor Jasny 25977e177b apple: add preliminary visionOS support 2023-07-11 20:20:25 +02:00
Brad King 75b573a628 Deprecate Visual Studio 12 2013 generator 
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
 2023-06-26 12:41:18 -04:00
Brad King 61bb728c0c Merge topic 'imported-target-framework-path' 
d605f728f7 macOS: Allow IMPORTED_LOCATION to be a framework folder

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8586
 2023-06-26 09:47:30 -04:00
Kyle Edwards d605f728f7 macOS: Allow IMPORTED_LOCATION to be a framework folder 
Issue: #24946
 2023-06-23 12:07:18 -04:00
Brad King 09df135b60 Merge topic 'FindEXPAT-static' 
302501ad36 FindEXPAT: add a EXPAT_USE_STATIC_LIBS hint

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8572
 2023-06-23 11:01:48 -04:00
Even Rouault 302501ad36 FindEXPAT: add a EXPAT_USE_STATIC_LIBS hint 
The effect of that hint is to restrict the candidate library names, but
more essentially to set the `XML_STATIC` compile definitions which is
required to get proper linking.

Vcpkg-Issue: https://github.com/microsoft/vcpkg/issues/1100
GDAL-Issue: https://github.com/OSGeo/gdal/issues/7955
 2023-06-22 10:18:07 -04:00
Even Rouault 97d0f76453 FindCURL: add a CURL_USE_STATIC_LIBS hint 
The effect of that hint is to set a CURL_STATICLIB compile definition,
and to auxiliary system windows libraries for MSVC builds.

GDAL-Issue: https://github.com/OSGeo/gdal/issues/7955
 2023-06-22 10:17:16 -04:00
Brad King ed37038a1c Merge topic 'cross-compiling-emulator-env-var' 
7005dea005 CrossCompiling: Load CMAKE_CROSSCOMPILING_EMULATOR from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8543
 2023-06-14 09:18:45 -04:00