summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* try_compile: Add SOURCE_FROM_FILEMatthew Woehlke2022-09-229-2/+61
| | | | | | | Add ability to copy try_compile (and try_run) source files from arbitrary locations into the operation directory. This is included for the sake of completion and consolidation, although use cases which actually require this may be rare.
* Tests: Clean up and simplify TryCompile testsMatthew Woehlke2022-09-223-46/+29
| | | | | | Add and use some additional helper macros to simplify repetitive checks. Use existing macros in more places. Tweak macros to improve output in case of failure.
* try_compile: Add SOURCE_FROM_{ARG,VAR}Matthew Woehlke2022-09-2215-14/+193
| | | | | | | | Add ability to "feed" try_compile (and try_run) sources more directly, either from literal content, or from a CMake variable which contains literal content. This saves the user from needing a separate step to write the content to a file, and allows for the sources to only exist in the scratch directory.
* Merge topic 'use-new-project-try_compile'Brad King2022-09-195-16/+17
|\ | | | | | | | | | | | | | | d00d8537f6 Modules: Use new keyword-dispatched try_compile signature Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7690
| * Modules: Use new keyword-dispatched try_compile signatureMatthew Woehlke2022-09-165-16/+17
| | | | | | | | | | | | Modify modules that ship with CMake and use the project flavor of try_compile to use the new signature added by commit 56ae40cc59 (try_compile: Add PROJECT keyword-dispatched signature, 2022-09-14).
* | Merge topic 'transitive-usage-reqs-lnks'Brad King2022-09-1910-33/+42
|\ \ | | | | | | | | | | | | | | | | | | 3d31f99b74 Help: Link from usage requirement commands to detailed explanation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7653
| * | Help: Link from usage requirement commands to detailed explanationHinell2022-09-1610-33/+42
| | | | | | | | | | | | | | | | | | | | | Augment vague mentions of "Transitive Usage Requirements" with links to a detailed explanation. Fixes: #23799
* | | Merge topic 'help-add-custom-comman-byproducts'Brad King2022-09-192-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 00b788e85e Help:custom_command: link policy on BYPRODUCTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7662
| * | | Help:custom_command: link policy on BYPRODUCTSHinell2022-09-162-0/+5
| |/ / | | | | | | | | | | | | | | | Link policy explaining BYPRODUCTS. Fixes: #23786
* | | Merge topic 'android-clang-no-ndk-version'Brad King2022-09-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1c86e397fe Android/Clang: Tolerate undefined CMAKE_ANDROID_NDK_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7689
| * | | Android/Clang: Tolerate undefined CMAKE_ANDROID_NDK_VERSIONBoris Egorov2022-09-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix for #21772, commit 005e2cdfb0 (Android: Do not use gold for ndk >= r22, 2021-02-26, v3.20.0-rc3~1^2), doesn't work with typical android toolchain file, like this one: https://android.googlesource.com/platform/ndk/+/master/build/cmake/android-legacy.toolchain.cmake The condition fails to work when CMAKE_ANDROID_NDK_VERSION is undefined: second part evaluates to true, although ndk version is not known. I've encountered following environment where CMAKE_ANDROID_NDK_VERSION is used without definition: * Build uses android toolchain file, which sets CMAKE_SYSTEM_VERSION=1 and doesn't set CMAKE_ANDROID_NDK_VERSION. * Code in Platform/Android-Determine.cmake exits early when it detects toolchain usage (via value CMAKE_SYSTEM_VERSION=1). This file is the only place in cmake modules where variable CMAKE_ANDROID_NDK_VERSION is set, and by early return we skip this definition.
* | | Merge topic 'env-tls-certs'Brad King2022-09-195-0/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 10bf34a2d9 cmCurl: Honor OpenSSL certificate environment variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7670
| * | | cmCurl: Honor OpenSSL certificate environment variablesMaxim Cournoyer2022-09-165-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Honor the OpenSSL environment variables used to specify the location of the TLS certificates, as specified in the `curl(1)` man page. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
* | | | Merge branch 'release-3.24'Brad King2022-09-190-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'matlab-r2022b' into release-3.24Brad King2022-09-191-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edbdfba3f5 FindMatlab: add R2022b 9.13 version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7683
* | \ \ \ \ Merge topic 'matlab-r2022b'Brad King2022-09-191-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | edbdfba3f5 FindMatlab: add R2022b 9.13 version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7683
| * | | | | FindMatlab: add R2022b 9.13 version mapMichael Hirsch2022-09-161-0/+1
| |/ / / /
* | | | | Merge topic 'add-try_compile-test-documentation'Brad King2022-09-192-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests: document try_{compile,run} old/new signature testingMatthew Woehlke2022-09-152-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a brief documentation blurb to the try_compile and try_run test sets on writing tests for both "old" and "new" signatures.
* | | | | | Merge topic 'improve-try_compile-arg-error'Brad King2022-09-195-7/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | try_compile: More useful error if insufficient argumentsMatthew Woehlke2022-09-155-7/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Tweak try_compile and try_run to give a more informative error (rather than "unknown error") when given an insufficient number of arguments.
* | | | | | CMake Nightly Date StampKitware Robot2022-09-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-09-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-09-171-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'try_compile-new-project-signature'Brad King2022-09-1622-33/+147
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56ae40cc59 try_compile: Add PROJECT keyword-dispatched signature Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7677
| * | | | | try_compile: Add PROJECT keyword-dispatched signatureMatthew Woehlke2022-09-1422-33/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge topic 'xcode-lib-dirs'Brad King2022-09-168-4/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4cc39842e Xcode: Do not append per-config suffixes to library search paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7672
| * | | | | | Xcode: Do not append per-config suffixes to library search pathsMikko Sivulainen2022-09-158-4/+74
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add policy `CMP0142` to remove the automatic addition of the `$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)` suffix in a compatible way. Fixes: #21757
* | | | | | Merge topic 'fphsa-no-version-var'Brad King2022-09-164-9/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07f0a78874 FPHSA: Fix regression when VERSION_VAR is missing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7680
| * | | | | | FPHSA: Fix regression when VERSION_VAR is missingBrad King2022-09-154-9/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'cmake-presets-package-clear'Kyle Edwards2022-09-161-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec8b67918c cmCMakePresetsGraph: Clear package presets in ClearPresets() Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7688
| * | | | | | cmCMakePresetsGraph: Clear package presets in ClearPresets()Kyle Edwards2022-09-151-0/+2
| |/ / / / /
* | | | | | Merge topic 'cmake-presets-list-error-message'Kyle Edwards2022-09-164-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7087308ce cmake --list-presets: List package as a valid option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7684
| * | | | | cmake --list-presets: List package as a valid optionKyle Edwards2022-09-154-1/+6
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2022-09-161-1/+1
|/ / / /
* | | | Merge topic 'add_tasking_compiler'Brad King2022-09-1513-0/+267
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94df5b6ef1 Tasking: Add support for several compiler toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7491
| * | | | Tasking: Add support for several compiler toolsetsChristoph Seitz2022-09-1413-0/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'export-ios-app-layout'Brad King2022-09-151-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d26c520f4b export: Fix IMPORTED_LOCATION of iOS flat app bundles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7676
| * | | | | export: Fix IMPORTED_LOCATION of iOS flat app bundlesHarry Mallon2022-09-141-1/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'binutils-apple-no-lld'Brad King2022-09-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a54e25b547 BinUtils: Avoid the 'ld.lld' ELF linker on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7671
| * | | | | BinUtils: Avoid the 'ld.lld' ELF linker on Apple platformsCarlo Cabrera2022-09-141-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | `ld.lld` is an ELF linker, so we should never set `CMAKE_LINKER` to this when targeting an Apple platform.
* | | | | Merge topic 'fix-try_compile-tests'Brad King2022-09-153-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ecbf1f938 Tests: Fix recently added tests Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7678
| * | | | | Tests: Fix recently added testsMatthew Woehlke2022-09-143-3/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'release-3.24'Brad King2022-09-150-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindMatlab-macos-arm64' into release-3.24Brad King2022-09-151-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7673
* | \ \ \ \ Merge topic 'FindMatlab-macos-arm64'Brad King2022-09-151-1/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7673
| * | | | | FindMatlab: Add MEX binary file suffix for Apple Silicon native MatlabMichael Hirsch2022-09-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The Matlab MEX binary file suffix is distinct for Apple Silicon.
* | | | | | Merge branch 'release-3.24'Brad King2022-09-150-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'link-framework-with-multi-config-postfix' into release-3.24Brad King2022-09-154-11/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fc06450ff4 Apple: Fix regression when linking a framework with postfix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7675
* | | | | | Merge topic 'link-framework-with-multi-config-postfix'Brad King2022-09-154-11/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fc06450ff4 Apple: Fix regression when linking a framework with postfix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7675
generated by cgit v0.12 at 2025-01-10 11:33:38 (GMT)