summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* macOS: Speed up rpath install name dir lookup with a cacheLukas Böger2021-09-202-0/+20
| | | | Fixes: #20602
* CMake Nightly Date StampKitware Robot2021-09-191-1/+1
|
* Merge topic 'VersionCompare-use-std_string'Marc Chevrier2021-09-189-61/+69
|\ | | | | | | | | | | | | | | 7e154ebd59 cmSystemTools::VersionCompare: use std::string for arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6535
| * cmSystemTools::VersionCompare: use std::string for argumentsMarc Chevrier2021-09-179-61/+69
| |
* | CMake Nightly Date StampKitware Robot2021-09-181-1/+1
| |
* | Merge branch 'release-3.21'Brad King2021-09-170-0/+0
|\ \
| * \ Merge branch 'release-3.20' into release-3.21Brad King2021-09-170-0/+0
| |\ \
* | \ \ Merge branch 'release-3.20'Brad King2021-09-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'android-PATH' into release-3.20Brad King2021-09-161-5/+0
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6528
* | \ \ \ Merge branch 'release-3.21'Brad King2021-09-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'android-PATH' into release-3.21Brad King2021-09-171-5/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 94f3776774 Android: Restore searching PATH for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6528
* | | | | Merge topic 'android-PATH'Brad King2021-09-171-5/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 94f3776774 Android: Restore searching PATH for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6528
| * | | | Android: Restore searching PATH for executableshhb2021-09-161-5/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a7f41a7ee4 (Android: Fix find_* search order within NDK for unified toolchains, 2020-10-13, v3.20.0-rc1~610^2), we turn off `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`. This breaks `find_program` searching `PATH` for host executables. Fortunately, the setting turns out not to be necessary, perhaps since commit cbc51a8be3 (Android: restructure android search paths, 2020-11-06, v3.20.0-rc1~509^2). Without it, none of NDK tests fail, so remove it to restore pre-3.20 behavior. Fixes: #22634
* | | | Merge branch 'release-3.21'Brad King2021-09-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'iar-enable-in-list-operator' into release-3.21Brad King2021-09-171-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f77ffbc0e3 IAR: Restore support for projects not enabling policy CMP0057 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6527
* | \ \ \ Merge topic 'iar-enable-in-list-operator'Brad King2021-09-171-0/+5
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | f77ffbc0e3 IAR: Restore support for projects not enabling policy CMP0057 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6527
| * | | IAR: Restore support for projects not enabling policy CMP0057Jean-Marc Hengen2021-09-161-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5b9bfe738c (IAR: Moved search logic to BinUtils., 2021-07-19, v3.21.1~14^2), we use the `IN_LIST` operator in the `CMakeFindBinUtils` module. Set policy `CMP0057` to ensure it is available regardless of the project's policy settings. Fixes: #22640
* | | CMake Nightly Date StampKitware Robot2021-09-171-1/+1
| | |
* | | Merge topic 'xcode-embed-libraries'Craig Scott2021-09-1610-27/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6ef7bfbb64 Xcode: add support for embedding dynamic libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6490
| * | | Xcode: add support for embedding dynamic librariesLucas SOLTIC2021-09-1310-27/+44
| | | |
* | | | Merge topic 'clarify_cmake_policy_warning_doc'Brad King2021-09-161-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1230ceb97e Help: Improve explanation on CMAKE_POLICY_WARNING warnings occur Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6522
| * | | | Help: Improve explanation on CMAKE_POLICY_WARNING warnings occurRobert Maynard2021-09-151-2/+3
| | | | |
* | | | | Merge topic 'enh-CPack-SetOption-accepts-new-types'Brad King2021-09-1615-116/+129
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fce78982b Use new SetOption signatures 7aeb262278 cmCPackGenerator::SetOption accepts cmProp or std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6526
| * | | | | Use new SetOption signaturesMarc Chevrier2021-09-1514-112/+88
| | | | | |
| * | | | | cmCPackGenerator::SetOption accepts cmProp or std::stringMarc Chevrier2021-09-152-4/+41
| | | | | |
* | | | | | Merge topic 'enh-CTest-SetOption-accepts-new-types'Brad King2021-09-165-17/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f52451682 Use new SetOption signatures 8d0ae460de cmCTestGenericHandler::SetOption accepts cmProp or std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6525
| * | | | | | Use new SetOption signaturesMarc Chevrier2021-09-153-15/+15
| | | | | | |
| * | | | | | cmCTestGenericHandler::SetOption accepts cmProp or std::stringMarc Chevrier2021-09-152-2/+34
| |/ / / / /
* | | | | | Merge topic 'update-curl'Brad King2021-09-16128-3066/+3874
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 412189bce7 curl: Set build options the way we need for CMake 8ecd95845c Merge branch 'upstream-curl' into update-curl 386467c9dc curl 2021-09-14 (8e82f2a0) a8ae9c7055 curl: Update script to get curl 7.79.0 3cfd89add5 cmCurl: Fix file:// URLs with spaces for curl 7.78+ 63b5a6869e cmCurl: Adopt helper to fix file:// URLs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6523
| * | | | | | curl: Set build options the way we need for CMakeBrad King2021-09-151-0/+12
| | | | | | |
| * | | | | | Merge branch 'upstream-curl' into update-curlBrad King2021-09-15124-3029/+3817
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2021-09-14 (8e82f2a0)
| | * | | | | | curl 2021-09-14 (8e82f2a0)Curl Upstream2021-09-15124-3029/+3818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 8e82f2a04a238c54ba91e553e9a8452e6d405965 (curl-7_79_0).
| * | | | | | | curl: Update script to get curl 7.79.0Brad King2021-09-151-1/+1
| | | | | | | |
| * | | | | | | cmCurl: Fix file:// URLs with spaces for curl 7.78+Brad King2021-09-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since curl 7.78, URLs with spaces that are not encoded as `%20` or `+` are now correctly rejected with `CURLUE_MALFORMED_INPUT`. However, CMake has long accepted `file://` URLs with spaces in the path due to curl 7.77 and below accidentally allowing them. Preserve this by explicitly encoding spaces in such URLs before handing them to curl. See also upstream curl commit `b67d3ba73` (curl_url_set: reject spaces in URLs w/o CURLU_ALLOW_SPACE, 2021-05-31, curl-7_78_0~133).
| * | | | | | | cmCurl: Adopt helper to fix file:// URLsBrad King2021-09-153-35/+38
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate and generalize the helper added by commit e63dcb1378 (Encoding: Use encoding libcurl expects with file: urls., 2014-11-05, v3.2.0-rc1~420^2).
* | | | | | | Merge branch 'release-3.21'Brad King2021-09-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'vs2022' into release-3.21Brad King2021-09-164-3/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ac10394b VS: Update Visual Studio 17 2022 generator for Preview 4 f200f4d5a7 VS: Fix managed C++ project generation for VS 2022 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6524
* | \ \ \ \ \ \ Merge topic 'vs2022'Brad King2021-09-164-3/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ac10394b VS: Update Visual Studio 17 2022 generator for Preview 4 f200f4d5a7 VS: Fix managed C++ project generation for VS 2022 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6524
| * | | | | | | VS: Update Visual Studio 17 2022 generator for Preview 4Brad King2021-09-152-3/+9
| | | | | | | |
| * | | | | | | VS: Fix managed C++ project generation for VS 2022Brad King2021-09-152-0/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2022 expects managed `.vcxproj` files to have a `ManagedAssembly` element. Fixes: #22583
* | | | | | | Merge topic 'msvc-pch-obj-restriction'Brad King2021-09-163-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b9e04accb PCH: MSVC: Restrict OBJECT library INTERFACE_LINK_LIBRARIES usage Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6518
| * | | | | | | PCH: MSVC: Restrict OBJECT library INTERFACE_LINK_LIBRARIES usageCristian Adam2021-09-153-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pch object file could cause problems when the reused pch is passed through an OBJECT library, which would use INTERFACE_LINK_LIBRARIES to link the pch object file. Fixes: #22630
* | | | | | | | CMake Nightly Date StampKitware Robot2021-09-161-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'cpack-nsis-apps-n-features'Brad King2021-09-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb3b3bacdc CPack/NSIS: Fix uninstall on Windows using "Apps & Features" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6517
| * | | | | | CPack/NSIS: Fix uninstall on Windows using "Apps & Features"Andras Lasso2021-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to NSIS documentation [1], uninstaller executable path in UninstallString must always be quoted. Quote the uninstall executable in `NSIS.template.in` so that it works when the path has spaces. [1] https://nsis.sourceforge.io/Add_uninstall_information_to_Add/Remove_Programs
* | | | | | | Merge topic 'fltk_re-entrant'Brad King2021-09-151-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51fd21736b FindFLTK: Safe to include multiple times Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6519
| * | | | | | | FindFLTK: Safe to include multiple timesRobert Maynard2021-09-141-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindFLTK could store multiple entries in `FLTK_INCLUDE_DIR`, and when re-executed would stored into `FLTK_DIR` which had uses which presumed single entries. Fixes #13198
* | | | | | | | Merge topic 'cmProp-explicit-string_view-cast-operator'Brad King2021-09-156-9/+39
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79362cf117 cmProp: cm::string_view cast operator must be explicit Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6515
| * | | | | | | cmProp: cm::string_view cast operator must be explicitMarc Chevrier2021-09-146-9/+39
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid ambiguity on std::string assigment between the following two cmProp cast operators: * operator const std::string&() const noexcept * operator cm::string_view() const noexcept
* | | | | | | CMake Nightly Date StampKitware Robot2021-09-151-1/+1
|/ / / / / /
generated by cgit v0.12 at 2025-02-22 03:37:12 (GMT)