summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Genex LINK_LIBRARY: Add support for framework with postfixMarc Chevrier2022-09-219-56/+160
|
* Merge branch 'release-3.24'Brad King2022-09-210-0/+0
|\
| * Merge topic 'parse-large-int' into release-3.24Brad King2022-09-214-2/+85
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 8fc822e13a file: Avoid strange istringstream crash in cmake.org binaries on Alpine Linux 31f158e4c8 cmStringAlgorithms: Add functions to parse strings to long long integers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7698
* | \ Merge topic 'parse-large-int'Brad King2022-09-214-2/+85
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 8fc822e13a file: Avoid strange istringstream crash in cmake.org binaries on Alpine Linux 31f158e4c8 cmStringAlgorithms: Add functions to parse strings to long long integers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7698
| * | file: Avoid strange istringstream crash in cmake.org binaries on Alpine LinuxBrad King2022-09-201-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow using `istringstream` and `operator >>` to parse an integer crashes on Alpine Linux, at least when compiled with the settings we use for the official `cmake.org` Linux binaries. Since commit fd0c285b12 (file: Fix types of the OFFSET and LIMIT arguments, 2022-01-04, v3.23.0-rc1~133^2), this causes the `file(READ)` command to crash when parsing its `LIMIT` or `OFFSET` argument. Parse the input string with our dedicated helper to avoid the crash. Fixes: #23872
| * | cmStringAlgorithms: Add functions to parse strings to long long integersBrad King2022-09-203-0/+77
| | |
* | | Merge topic 'swift-mix-cxx'Brad King2022-09-218-7/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6ff19cc9d Tests: Add mixed Swift+CXX source test case 399343486f Tests: Add swift compiler version to test check a9509cec7e Ninja: Fix mixed Swift/CXX library target generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7679
| * | | Tests: Add mixed Swift+CXX source test caseEvan Wilde2022-09-196-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test ensures we can configure and build mixed source binaries. The test configures, but fails to verify due to multiple targets emitting the `lib.c.o` and `lib.cpp.o` outputs. Both the clang build step and the swift link step report that they emit the `lib.c.o` and `lib.cpp.o` outputs. The `.o`'s are emitted by clang, not by swift.
| * | | Tests: Add swift compiler version to test checkEvan Wilde2022-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | Include the swift compiler version in the set of exported variables from CheckSwift.cmake for Swift related tests.
| * | | Ninja: Fix mixed Swift/CXX library target generationEvan Wilde2022-09-161-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With how things were before, mixed Swift/C++ libraries would result in a broken ninja file. `cpp.cpp.o` was emitted by the compiler, but was also being included in the `linkBuild.Outputs` list, so it was being emitted by multiple targets. The fix checks that the source language is Swift before adding it to the list of additional outputs. If it is Swift, this isn't a problem. If it isn't Swift, we don't include it in the list of outputs. On the other side, the C++ file was also being passed as a source file, which the Swift compiler can't compile. So we add the C++ object file as an explicit dependency and the object file is then added to the list of Swift sources.
* | | | CMake Nightly Date StampKitware Robot2022-09-211-1/+1
| | | |
* | | | Merge topic 'detect-lib_foo.a-msvc'Brad King2022-09-202-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be848a71b0 MSVC: Teach find_library to consider the 'libfoo.a' naming convention Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7694
| * | | | MSVC: Teach find_library to consider the 'libfoo.a' naming conventionYonggang Luo2022-09-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When targeting the GNU ABI, we consider `.a` libraries first but also accept `.lib`. For symmetry, when targeting the MSVC ABI, we now consider `.lib` first but also accept `.a`. This adds support for meson-generated static libraries, which are named with the pattern `lib${foo}.a`: * https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa Fixes: #23975 Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
* | | | | Merge topic 'help-byproducts'Brad King2022-09-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37381506dc Help: Link from add_custom_target to policy on BYPRODUCTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7695
| * | | | | Help: Link from add_custom_target to policy on BYPRODUCTSHinell2022-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link policy explaining BYPRODUCTS. Apply the change from commit 00b788e85e (Help:custom_command: link policy on BYPRODUCTS, 2022-09-09) to `add_custom_target` docs too. Issue: #23786
* | | | | | Merge topic 'try_compile-more-consistent-errors'Brad King2022-09-203-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30a234d275 try_compile: Improve error message consistency Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7696
| * | | | | | try_compile: Improve error message consistencyMatthew Woehlke2022-09-163-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak some error messages from try_compile (and try_run) to be more consistent with each other.
* | | | | | | CMake Nightly Date StampKitware Robot2022-09-201-1/+1
| |/ / / / / |/| | | | |
* | | | | | 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
|/ / / / /
generated by cgit v0.12 at 2025-02-21 23:50:08 (GMT)