mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
59,040 Commits 2 Branches 401 Tags
10afb5eb8716545f0cd2cf26b79577b2a1829cd8
Commit Graph

59040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 10afb5eb87 Merge branch 'release-3.24' 2022-09-19 10:19:12 -04:00
Brad King 689eb0c306 Merge topic 'matlab-r2022b' 
edbdfba3f5 FindMatlab: add R2022b 9.13 version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7683
 2022-09-19 10:19:12 -04:00
Brad King 27a05e84e2 Merge topic 'matlab-r2022b' into release-3.24 
edbdfba3f5 FindMatlab: add R2022b 9.13 version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7683
 2022-09-19 10:19:11 -04:00
Brad King ea792d5812 Merge topic 'add-try_compile-test-documentation' 
e933fccc7e Tests: document try_{compile,run} old/new signature testing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7681
 2022-09-19 10:18:04 -04:00
Brad King 33f314764d Merge topic 'improve-try_compile-arg-error' 
f976800577 try_compile: More useful error if insufficient arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7682
 2022-09-19 10:17:02 -04:00
Kitware Robot 40af69a106 CMake Nightly Date Stamp 2022-09-19 00:01:23 -04:00
Kitware Robot 9bdeaa79e2 CMake Nightly Date Stamp 2022-09-18 00:01:11 -04:00
Kitware Robot c364068a81 CMake Nightly Date Stamp 2022-09-17 00:01:16 -04:00
Michael Hirsch edbdfba3f5 FindMatlab: add R2022b 9.13 version map 2022-09-16 10:29:19 -04:00
Brad King 3436858697 Merge topic 'try_compile-new-project-signature' 
56ae40cc59 try_compile: Add PROJECT keyword-dispatched signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7677
 2022-09-16 10:26:27 -04:00
Brad King ed8e860998 Merge topic 'xcode-lib-dirs' 
d4cc39842e Xcode: Do not append per-config suffixes to library search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7672
 2022-09-16 10:25:14 -04:00
Brad King 95d54eef45 Merge topic 'fphsa-no-version-var' 
07f0a78874 FPHSA: Fix regression when VERSION_VAR is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7680
 2022-09-16 10:23:50 -04:00
Kyle Edwards 24ee97edf5 Merge topic 'cmake-presets-package-clear' 
ec8b67918c cmCMakePresetsGraph: Clear package presets in ClearPresets()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7688
 2022-09-16 09:51:50 -04:00
Kyle Edwards a638dff7b3 Merge topic 'cmake-presets-list-error-message' 
e7087308ce cmake --list-presets: List package as a valid option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7684
 2022-09-16 09:51:13 -04:00
Kitware Robot cabba23ab2 CMake Nightly Date Stamp 2022-09-16 00:01:22 -04:00
Kyle Edwards ec8b67918c cmCMakePresetsGraph: Clear package presets in ClearPresets() 2022-09-15 16:36:43 -04:00
Kyle Edwards e7087308ce cmake --list-presets: List package as a valid option 2022-09-15 14:50:55 -04:00
Matthew Woehlke f976800577 try_compile: More useful error if insufficient arguments 
Tweak try_compile and try_run to give a more informative error (rather
than "unknown error") when given an insufficient number of arguments.
 2022-09-15 13:34:30 -04:00
Matthew Woehlke e933fccc7e Tests: document try_{compile,run} old/new signature testing 
Add a brief documentation blurb to the try_compile and try_run test sets
on writing tests for both "old" and "new" signatures.
 2022-09-15 12:32:38 -04:00
Brad King 07f0a78874 FPHSA: Fix regression when VERSION_VAR is missing 
If a package is found but FPHSA is called by the find module without a
`VERSION_VAR`, and the `find_package` call specifies a version, we have
previously accepted the package as found.  This was accidentally
regressed by commit 8f50f135ae (FPHSA: Improve error message when
VERSION_VAR is empty or has been unset(), 2022-08-01).  Restore it and
add a test case.
 2022-09-15 11:00:02 -04:00
Mikko Sivulainen d4cc39842e Xcode: Do not append per-config suffixes to library search paths 
Add policy `CMP0142` to remove the automatic addition of the
`$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)` suffix in a compatible way.

Fixes: #21757
 2022-09-15 10:27:23 -04:00
Brad King 01a25d72c6 Merge topic 'add_tasking_compiler' 
94df5b6ef1 Tasking: Add support for several compiler toolsets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7491
 2022-09-15 09:19:58 -04:00
Brad King 3c6d2c0213 Merge topic 'export-ios-app-layout' 
d26c520f4b export: Fix IMPORTED_LOCATION of iOS flat app bundles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7676
 2022-09-15 09:08:43 -04:00
Brad King c3522accd5 Merge topic 'binutils-apple-no-lld' 
a54e25b547 BinUtils: Avoid the 'ld.lld' ELF linker on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7671
 2022-09-15 09:07:51 -04:00
Brad King b178311c63 Merge topic 'fix-try_compile-tests' 
4ecbf1f938 Tests: Fix recently added tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7678
 2022-09-15 09:07:04 -04:00
Brad King 89ef919263 Merge branch 'release-3.24' 2022-09-15 09:05:53 -04:00
Brad King 671509ff27 Merge topic 'FindMatlab-macos-arm64' 
f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7673
 2022-09-15 09:05:53 -04:00
Brad King 6a15cb88ef Merge topic 'FindMatlab-macos-arm64' into release-3.24 
f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7673
 2022-09-15 09:05:52 -04:00
Brad King a87cb4a587 Merge branch 'release-3.24' 2022-09-15 09:04:49 -04:00
Brad King 2b91a96633 Merge topic 'link-framework-with-multi-config-postfix' 
fc06450ff4 Apple: Fix regression when linking a framework with postfix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7675
 2022-09-15 09:04:49 -04:00
Brad King 68540c0c92 Merge topic 'link-framework-with-multi-config-postfix' into release-3.24 
fc06450ff4 Apple: Fix regression when linking a framework with postfix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7675
 2022-09-15 09:04:48 -04:00
Kitware Robot 9b22e036d1 CMake Nightly Date Stamp 2022-09-15 00:01:21 -04:00
Matthew Woehlke 56ae40cc59 try_compile: Add PROJECT keyword-dispatched signature 
Introduce a new signature for the project flavor of try_compile (and
try_run) which removes the `bindir` argument and adds a required PROJECT
tag. This is similar to the SOURCES flavor added by commit aa9220d3
(try_compile: Add keyword-dispatched signature, 2022-09-02).
 2022-09-14 16:35:50 -04:00
Matthew Woehlke 4ecbf1f938 Tests: Fix recently added tests 
Fix the tests added by commit 0c141b03 (try_compile: Record output
location instead of reverse computing it, 2022-08-31), which were added
as old-and-new-signature tests but only used the old signature.
 2022-09-14 16:01:19 -04:00
Marc Chevrier fc06450ff4 Apple: Fix regression when linking a framework with postfix 
Fix a regression caused by commit 40178f3c90 (cmGlobalGenerator: Add
helper to split framework path, 2022-02-10, v3.24.0-rc1~661^2~1).

Fixes: #23961
 2022-09-14 14:55:27 -04:00
Harry Mallon d26c520f4b export: Fix IMPORTED_LOCATION of iOS flat app bundles 
iOS/tvOS app bundles are flat and do not include the `Contents/MacOS/`
layers, so they should not be in the `IMPORTED_LOCATION`.  Use the same
logic that commit 34f5ef564a (iOS: Fix App Bundle layout, 2015-12-10,
v3.5.0-rc1~129^2~1) added for the installation layout.

Fixes: #23963
 2022-09-14 14:49:05 -04:00
Michael Hirsch f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab 
The Matlab MEX binary file suffix is distinct for Apple Silicon.
 2022-09-14 14:05:35 -04:00
Christoph Seitz 94df5b6ef1 Tasking: Add support for several compiler toolsets 
Add support for the Tasking compiler toolset:

* TriCore Compiler Toolset 6.3 (with TriCore, ARM, MCS,
  8051 and PCP architecture compilers)
* SmartCode Compiler Toolset 10.1 (with TriCore, ARC, MCS,
  8051 architecture compilers)
* ARM Compiler 6.0
* MCS Complier 3.3
* 8051 Compiler 7.2

Fixes: #23756
 2022-09-14 09:58:50 -04:00
Carlo Cabrera a54e25b547 BinUtils: Avoid the 'ld.lld' ELF linker on Apple platforms 
`ld.lld` is an ELF linker, so we should never set `CMAKE_LINKER` to this
when targeting an Apple platform.
 2022-09-14 09:34:14 -04:00
Brad King c3e68020d6 Merge topic 'MsvcDebugInformationFormatAbstraction' 
a858466aac MSVC: Add test for debug information format
0e96a20478 MSVC: Add abstraction for debug information format
d4c8111da4 Clang/Windows: Clarify name of internal runtime library flags variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7606
 2022-09-14 09:21:27 -04:00
Brad King a858466aac MSVC: Add test for debug information format 
Verify that the format's flags are used to compile, both in the
main project and in `try_compile` test projects.
 2022-09-14 09:12:47 -04:00
Glen Chung 0e96a20478 MSVC: Add abstraction for debug information format 
Replace our hard-coded default for `/Zi` with a first-class abstraction
to select the debug information format an enumeration of logical
names.  We've long hesitated to do this because the idea of "debug
information format" touches on related concepts on several platforms.
Avoid that scope creep by simply defining an abstraction that applies
only when targeting the MSVC ABI on Windows.

Removing the old default flag requires a policy because existing
projects may rely on string processing to edit them and choose a
runtime library under the old behavior.  Add policy CMP0141 to
provide compatibility.

Fixes: #10189
 2022-09-14 09:12:47 -04:00
Brad King e457663ac1 Merge topic 'Windows-Intel-dependencies' 
90874a542e Intel classic compilers on Windows: use msvc style dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7668
 2022-09-14 08:14:30 -04:00
Brad King 20f9b6973b Merge topic 'modules-use-new-try_compile-signature' 
2edf0fc6d7 Modules: Use new keyword-dispatched try_compile signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7656
 2022-09-14 08:13:27 -04:00
Brad King 64b80f54f0 Merge topic 'cmake-presets-package-unsupported-error' 
3546657cc7 CMakePresets.json: Fix error message for unsupported package presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7669
 2022-09-14 08:01:52 -04:00
Matthew Woehlke 2edf0fc6d7 Modules: Use new keyword-dispatched try_compile signature 
Modify most of the modules that ship with CMake to use the new
try_compile / try_run signatures added by commit aa9220d3a0
(try_compile: Add keyword-dispatched signature, 2022-09-02). This
improves debugging by each invocation using its own directory so that
the results of multiple invocations can be retained.

This does not cover any invocations which provide an entire project, as
that flavor of try_compile has not yet been updated.
 2022-09-14 07:52:16 -04:00
Kitware Robot 0a9ce1ec3c CMake Nightly Date Stamp 2022-09-14 00:01:12 -04:00
Marc Chevrier 90874a542e Intel classic compilers on Windows: use msvc style dependencies 
Intel classic compilers generate erroneous dependencies when gcc style
is used with paths containing spaces. So, fall back to the old way to
generate dependencies by using option /showIncludes.

Fixes: #23948
 2022-09-13 17:47:01 +02:00
Brad King d4c8111da4 Clang/Windows: Clarify name of internal runtime library flags variables 
Also avoid extra spaces in resulting flag strings.
 2022-09-13 11:19:07 -04:00
Kyle Edwards 3546657cc7 CMakePresets.json: Fix error message for unsupported package presets 2022-09-13 10:42:11 -04:00