summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Merge topic 'pch-xcode-multiple-languages'Brad King2021-09-147-2/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbcdac4e5d PCH: Fix all-language precompile header support in Xcode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6435
| * | | | PCH: Fix all-language precompile header support in XcodeCristian Adam2021-09-137-2/+52
| | | | | | | | | | | | | | | | | | | | Fixes: #22384
* | | | | Merge topic 'find-matlab-imported-targets'Brad King2021-09-144-0/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 161990b921 FindMatlab: Add imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6488
| * | | | | FindMatlab: Add imported targetsSilvio Traversaro2021-09-134-0/+103
| | | | | |
* | | | | | Merge topic 'GNUInstallDirs_become_conda_install_aware'Brad King2021-09-141-5/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecaca8c129 GNUInstallDirs now aware of conda lib directory requirements Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Silvio Traversaro <pegua1@gmail.com> Merge-request: !6512
| * | | | | | GNUInstallDirs now aware of conda lib directory requirementsRobert Maynard2021-09-131-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No matter the OS when installing for conda the library components need to be placed into the `lib` directory. To better meet these requirements GNUInstallDirs now checks to see if it is being asked to install into a conda install location, and if so use the 'lib' directory instead of the system directory name.
* | | | | | | Merge topic 'refactor-CPack-GetOption-returns-cmProp'Brad King2021-09-1426-494/+462
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 202a65759b cmCPackGenerator::GetOption returns cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6506
| * | | | | | | cmCPackGenerator::GetOption returns cmPropMarc Chevrier2021-09-1326-494/+462
| | | | | | | |
* | | | | | | | Merge topic 'refactor-CTest-GetOption-returns-cmProp'Brad King2021-09-147-35/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9bcde974e cmCTestGenericHandler::GetOption returns cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6505
| * | | | | | | | cmCTestGenericHandler::GetOption returns cmPropMarc Chevrier2021-09-137-35/+30
| |/ / / / / / /
* | | | | | | | Merge topic 'update-jsoncpp'Brad King2021-09-1417-2339/+2291
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffc6be33a7 IWYU: Map jsoncpp internal header to its public header d7dfb84f89 Merge branch 'upstream-jsoncpp' into update-jsoncpp 0b97650518 jsoncpp 2020-09-25 (9059f5ca) d9f8e39357 jsoncpp: Update script to get jsoncpp 1.9.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6514
| * | | | | | | | IWYU: Map jsoncpp internal header to its public headerBrad King2021-09-101-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2021-09-0915-2338/+2289
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
| | * | | | | | | | jsoncpp 2020-09-25 (9059f5ca)JsonCpp Upstream2021-09-0915-2304/+2291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/open-source-parsers/jsoncpp.git at commit 9059f5cad030ba11d37818847443a53918c327b1 (1.9.4).
| * | | | | | | | | jsoncpp: Update script to get jsoncpp 1.9.4Brad King2021-09-091-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'iwyu-cl'Brad King2021-09-1410-3/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccfe1b0b40 IWYU: Add `--driver-mode=cl` when applicable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6511
| * | | | | | | | | | IWYU: Add `--driver-mode=cl` when applicablePigeonF2021-09-1010-3/+47
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already do this for `clang-tidy`. Fixes: #16554
* | | | | | | | | | Merge topic 'CMakeDependentOption-condition-syntax'Brad King2021-09-1417-21/+143
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 059b90a0b4 CMakeDependentOption: Introduce policy CMP0127 for full Condition Syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6493
| * | | | | | | | | | CMakeDependentOption: Introduce policy CMP0127 for full Condition SyntaxDaniel Schürmann2021-09-1017-21/+143
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22303
* | | | | | | | | | Merge topic 'CMakeFindPackageMode-sysroot'Brad King2021-09-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8defe3380e CMakeFindPackageMode: Honor CMAKE_SYSROOT to detect lib64 platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6513
| * | | | | | | | | | CMakeFindPackageMode: Honor CMAKE_SYSROOT to detect lib64 platformsPablo Romero2021-09-091-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `CMAKE_SYSROOT` to check the full path on host OS. In a non-crosscompiling use case, the call to `CMAKE_SYSROOT` is empty. Fixes: #22608
* | | | | | | | | | CMake Nightly Date StampKitware Robot2021-09-141-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-09-131-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-09-121-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'document_find_package_version_restrictions'Craig Scott2021-09-111-5/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 563139e5e9 Help: find_package document version only supports numeric components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6510
generated by cgit v0.12 at 2025-02-11 04:46:42 (GMT)