summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack/NuGet: Add settings for the license, icon, and languageBob Apthorpe2020-11-054-11/+168
| | | | | | Also update the XML Schema. Fixes: #21348
* Merge topic 'cmake-16773'Kyle Edwards2020-10-2212-8/+56
|\ | | | | | | | | | | | | | | 3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5405
| * include: refactor call sites of cmMakefile::ReadDependentFileAsit Dhal2020-10-2112-8/+56
| | | | | | | | Fixes: #16773
* | Merge branch 'release-3.19'Kyle Edwards2020-10-220-0/+0
|\ \
| * \ Merge topic 'cmake-presets-invalid-macro' into release-3.19Kyle Edwards2020-10-2217-183/+268
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
* | \ \ Merge topic 'cmake-presets-invalid-macro'Kyle Edwards2020-10-2217-183/+268
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
| * | | CMakePresets.json: Properly report macro expansion errorsKyle Edwards2020-10-2117-183/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a distinction between strings which simply use the $vendor{<...>} macro, which is valid but makes it unusable by CMake, and strings which actually contain invalid macro expansions. Fixes: #21308
* | | | Merge branch 'release-3.19'Kyle Edwards2020-10-220-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'cmake-presets-boolean-cache' into release-3.19Kyle Edwards2020-10-226-7/+71
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 920d180047 CMakePresets.json: Allow boolean for cache variable value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5398
* | | | Merge topic 'cmake-presets-boolean-cache'Kyle Edwards2020-10-226-7/+71
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 920d180047 CMakePresets.json: Allow boolean for cache variable value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5398
| * | | CMakePresets.json: Allow boolean for cache variable valueKyle Edwards2020-10-216-7/+71
| |/ / | | | | | | | | | Fixes: #21327
* | | Merge topic 'move_pch_information_to_projects_where_possible'Brad King2020-10-221-19/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9df1f33c9a VisualStudio: move PCH rules to projects when possible. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5395
| * | | VisualStudio: move PCH rules to projects when possible.Robert Maynard2020-10-201-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This dramatically helps reduce the size of the solution files when PCH is enabled, since 2 entries per source file are removed. This also corrects a subtle issue where when UNITY + PCH was enabled, the PCH would not be used if a user explicitly tried to compile a source file from outside the unity group. This is possible via the compile source option in the Visual Studio GUI.
* | | | CMake Nightly Date StampKitware Robot2020-10-221-1/+1
| | | |
* | | | Merge topic 'constify'Brad King2020-10-2119-59/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd705788f6 Constify some code as suggested by clang-tidy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5391
| * | | | Constify some code as suggested by clang-tidyCengizhan Pasaoglu2020-10-1919-59/+61
| | | | |
* | | | | Merge branch 'release-3.19'Kyle Edwards2020-10-210-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'cmakepresets-schema' into release-3.19Kyle Edwards2020-10-2110-2/+315
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21bc2fd945 CI: Install jsonschema for schema testing e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 0307f7c980 Help: Add JSON schema for CMakePresets.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5366
* | \ \ \ \ Merge topic 'cmakepresets-schema'Kyle Edwards2020-10-2110-2/+315
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf6ac2d365 Merge branch 'master' into cmakepresets-schema 21bc2fd945 CI: Install jsonschema for schema testing e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 0307f7c980 Help: Add JSON schema for CMakePresets.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5366
| * \ \ \ \ \ Merge branch 'master' into cmakepresets-schemaKyle Edwards2020-10-20157-5810/+1413
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | CI: Install jsonschema for schema testingKyle Edwards2020-10-203-1/+3
| | | | | | |
| * | | | | | Tests: Add JSON schema validation to CMakePresets.json testsKyle Edwards2020-10-204-1/+61
| | | | | | |
| * | | | | | Help: Add JSON schema for CMakePresets.jsonBen McMorran2020-10-203-0/+251
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-10-211-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.19'Brad King2020-10-200-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'ci-win-python' into release-3.19Brad King2020-10-202-0/+44
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f7fef629b ci: add Python to PATH on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5403
* | | | | | Merge topic 'ci-win-python'Brad King2020-10-202-0/+44
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | 8f7fef629b ci: add Python to PATH on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5403
| * | | | ci: add Python to PATH on WindowsBrad King2020-10-202-0/+44
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Our test suite searches for a Python interpreter to perform some extra checks. Our CI base images for Linux have Python available. Update our Windows jobs to provide a Python interpreter for our test suite to find consistently between the build and test steps.
* | | | Merge branch 'release-3.19'Kyle Edwards2020-10-200-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'cmake-presets-doc-move' into release-3.19Kyle Edwards2020-10-206-332/+388
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a123fc28c Help: Clarify purpose of warnings and errors 6c74bcfc20 Help: Make architecture and toolset descriptions generic 45766789a0 Help: Add inheritance to CMakePresets.json example 88c9d6f6eb Help: Add documentation for debug field efab856008 Help: Show environment field 2208db114c Help: Show multiple ways of doing cacheVariables d30f85193f Help: Move vendor field into example b9c8c57860 Help: s/unusedVars/unusedCli/ ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5373
* | \ \ \ Merge topic 'cmake-presets-doc-move'Kyle Edwards2020-10-206-332/+388
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a123fc28c Help: Clarify purpose of warnings and errors 6c74bcfc20 Help: Make architecture and toolset descriptions generic 45766789a0 Help: Add inheritance to CMakePresets.json example 88c9d6f6eb Help: Add documentation for debug field efab856008 Help: Show environment field 2208db114c Help: Show multiple ways of doing cacheVariables d30f85193f Help: Move vendor field into example b9c8c57860 Help: s/unusedVars/unusedCli/ ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5373
| * | | | Help: Clarify purpose of warnings and errorsKyle Edwards2020-10-191-4/+4
| | | | |
| * | | | Help: Make architecture and toolset descriptions genericKyle Edwards2020-10-191-4/+4
| | | | |
| * | | | Help: Add inheritance to CMakePresets.json exampleKyle Edwards2020-10-191-0/+7
| | | | |
| * | | | Help: Add documentation for debug fieldKyle Edwards2020-10-191-0/+20
| | | | | | | | | | | | | | | | | | | | Oops!
| * | | | Help: Show environment fieldKyle Edwards2020-10-192-0/+5
| | | | |
| * | | | Help: Show multiple ways of doing cacheVariablesKyle Edwards2020-10-192-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | This demonstrates both the simple string and the complex object, and ensures that they get automated testing.
| * | | | Help: Move vendor field into exampleKyle Edwards2020-10-192-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the vendor field gets automated testing from the example.
| * | | | Help: s/unusedVars/unusedCli/Kyle Edwards2020-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a mistake in the documentation. Fixes: #21303
| * | | | Help: Move CMakePresets.json documentation into a separate fileKyle Edwards2020-10-194-329/+353
| | | | |
* | | | | Merge topic 'nsis-utf-8-bom'Brad King2020-10-202-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5392
| * | | | | CPack/NSIS: Template file in UTF-8 BOM to support UnicodeJohnny Jazeix2020-10-192-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21318
* | | | | | Merge branch 'release-3.19'Brad King2020-10-200-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'find_package-check-dir' into release-3.19Brad King2020-10-201-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0356b81525 find_package: Fix regression in searching root prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5396
* | \ \ \ \ \ Merge topic 'find_package-check-dir'Brad King2020-10-201-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0356b81525 find_package: Fix regression in searching root prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5396
| * | | | | | find_package: Fix regression in searching root prefixBrad King2020-10-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the check added by commit 2ff1693066 (find_package: avoid showing files as directories when searching config files, 2020-09-30, v3.19.0-rc1~67^2) to avoid skipping the root prefix `/`. Fixes: #21324
* | | | | | CMake Nightly Date StampKitware Robot2020-10-201-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'checklanguage-honor-toolchain'Brad King2020-10-195-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bddc54a37d CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5384
| * | | | | CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test projectSamir Benmendil2020-10-165-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20545
* | | | | | Merge branch 'release-3.19'Brad King2020-10-190-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |