summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCTestGenericHandler::SetOption accepts cmProp or std::stringMarc Chevrier2021-09-152-2/+34
|
* 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
| * | | | | | | Help: find_package document version only supports numeric componentsRobert Maynard2021-09-091-5/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-09-111-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'enh-AddCacheEntry-accepts-new-types'Marc Chevrier2021-09-1014-63/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f84193292c Use new AddCacheEntry signatures 3c2e58eeb8 AddCacheEntry accept cmProp or std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6495
| * | | | | | Use new AddCacheEntry signaturesMarc Chevrier2021-09-1010-56/+47
| | | | | | |
| * | | | | | AddCacheEntry accept cmProp or std::stringMarc Chevrier2021-09-106-7/+43
| | | | | | |
* | | | | | | Merge topic 'vs_settings'Brad King2021-09-106-44/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f21158cdfe VS: Honor VS_SETTINGS source file property on all sources 3bf013632d cmVisualStudio10TargetGenerator: Factor out helper to write VS_SETTINGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6492
| * | | | | | | VS: Honor VS_SETTINGS source file property on all sourcesSteven Boswell2021-09-096-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the feature added by commit 2ce42f281f (VS: Add VS_SETTINGS source file property, 2020-03-18, v3.18.0-rc1~449^2~3) to support all source file types.
| * | | | | | | cmVisualStudio10TargetGenerator: Factor out helper to write VS_SETTINGSSteven Boswell2021-09-092-36/+46
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'vs-csproj-scripts'Brad King2021-09-104-5/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b284a21fee VS: Add missing label in C# project-build events Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6485
| * | | | | | | VS: Add missing label in C# project-build eventsSteven Boswell2021-09-094-5/+26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21440
* | | | | | | Merge topic 'icu-advanced'Brad King2021-09-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdd2714dfa FindICU: Really mark variables as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6507
| * | | | | | | FindICU: Really mark variables as advancedMathieu Malaterre2021-09-061-2/+2
| | | | | | | |
* | | | | | | | Merge topic 'clang_msvc_frontend_detection_for_asm'Brad King2021-09-101-1/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9c79dde41 Clang: Add MSVC frontend detection for the ASM compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6481
| * | | | | | | | Clang: Add MSVC frontend detection for the ASM compilerThomas Bernard2021-09-091-1/+18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #22495
* | | | | | | | Merge topic 'ctest-memcheck-generate-test.xml'Brad King2021-09-108-1/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce44c2cec3 ctest_memcheck: generate `DynamicAnalysis-Test.xml` as well Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6491
| * | | | | | | | ctest_memcheck: generate `DynamicAnalysis-Test.xml` as wellBen Boeckel2021-09-098-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful so that memcheck results also show up as test results on CDash. It will be submitted with the other `MemCheck` parts. Fixes: #22190
* | | | | | | | | Merge topic 'ninja-rc'Brad King2021-09-101-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa2f6e0f5a cmNinjaTargetGenerator: Use short path for cmcldeps.exe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6502