summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-multi-framework-dependency-autogen-fix'Brad King2020-02-1829-87/+152
|\ | | | | | | | | | | | | | | 665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix 7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4363
| * Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ↵Kyle Edwards2020-02-1729-87/+152
| |\ | | | | | | | | | ninja-multi-framework-dependency-autogen-fix
| | * Ninja Multi-Config: Fix issue with framework dependencies and AutogenKyle Edwards2020-02-1729-87/+152
| | | | | | | | | | | | Fixes: #20345
* | | CMake Nightly Date StampKitware Robot2020-02-181-1/+1
| | |
* | | Merge branch 'release-3.17'Brad King2020-02-170-0/+0
|\ \ \
| * \ \ Merge topic 'git-config-with-spaces' into release-3.17Brad King2020-02-175-13/+28
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 40d1d29cfa Tests: Add missing ExternalProject smoke tests afc8956765 Tests: Fix test_clean target missing some test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4364
* | | | Merge topic 'git-config-with-spaces'Brad King2020-02-175-13/+28
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 40d1d29cfa Tests: Add missing ExternalProject smoke tests afc8956765 Tests: Fix test_clean target missing some test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4364
| * | | ExternalProject: Quote each git --config option to handle spacesCraig Scott2020-02-152-2/+4
| | | | | | | | | | | | Fixes: #20354
| * | | Tests: Add missing ExternalProject smoke testsCraig Scott2020-02-151-0/+8
| | | |
| * | | Tests: Fix test_clean target missing some test directoriesCraig Scott2020-02-153-11/+16
| | | |
* | | | Merge topic 'makefiles-deep-configure'Brad King2020-02-174-16/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4359
| * | | Makefiles: Re-run CMake if file configured in subdirectory is missingHugh Sorby2020-02-144-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add files configured by all subdirectories to `CMAKE_MAKEFILE_PRODUCTS` rather than just those from the top level. Fixes: #19719
* | | | CMake Nightly Date StampKitware Robot2020-02-171-1/+1
| | | |
* | | | Merge topic 'docs-cpack-typos'Craig Scott2020-02-162-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a4743b2c3 Help: Correct typos in CPack docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4366
| * | | | Help: Correct typos in CPack docsJoachim Wuttke (h)2020-02-162-2/+2
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2020-02-161-1/+1
| | | |
* | | | Merge topic 'doc-cpack'Craig Scott2020-02-153-38/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ea52ece71 Help: module CPack: improve summary and Introduction 5c4d730dd4 Help: CPackComponent: improve summary and introduction 40da958d23 Help: CPack Archive Generator: Clarify source vs binary package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4354
| * | | | Help: module CPack: improve summary and IntroductionJoachim Wuttke (o)2020-02-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In summary: * we configure generators, not the generated installers * we generate installers or source packages, not source package installers * In Introduction: * Make paragraph on binary installers more concise * Remove example that refered to CMake source tree * Add paragraph on source packages * omit the parenthesis on graphical installers
| * | | | Help: CPackComponent: improve summary and introductionJoachim Wuttke (o)2020-02-141-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: * provide some hyperlinks * update parenthesis on graphical installers (no longer restricted to Win and macOS)
| * | | | Help: CPack Archive Generator: Clarify source vs binary packageJoachim Wuttke (o)2020-02-141-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Simplify summary - Revise introduction: - Explain how to package source files, provide configuration sample - Clarify source vs binary package - Clarify meaning of variables (Mandatory=ON makes no sense if a default is defined)
* | | | | CMake Nightly Date StampKitware Robot2020-02-151-1/+1
| | | | |
* | | | | Merge topic 'update-libarchive'Brad King2020-02-14154-1336/+11647
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b83d96f164 libarchive: Update to build within CMake 5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive 8cce62295a LibArchive 2020-02-11 (3288ebb0) 9a27ecd416 libarchive: Update script to get 3.4.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4362
| * | | | | libarchive: Update to build within CMakeBrad King2020-02-135-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-code more libarchive options as internal cache entries. Doing so makes some of our `IF(0)` conditions unnecessary, so remove those.
| * | | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2020-02-13151-1319/+11634
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2020-02-11 (3288ebb0) Also manually restore content from upstream libarchive's main `CMakeLists.txt` file that was removed by previous commits and exclude it with `IF(0)` blocks. Do this as an evil merge so that `git blame -C` can follow the content to upstream.
| | * | | | | LibArchive 2020-02-11 (3288ebb0)LibArchive Upstream2020-02-13153-1325/+11285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 3288ebb0353beb51dfb09d444dedbe9235ead53d (v3.4.2).
| * | | | | | libarchive: Update script to get 3.4.2Brad King2020-02-131-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'cpack-doc-ifw'Brad King2020-02-141-18/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdf50941d2 Help: CPack IFW Generator: not only configures, but also runs QtIFW. 6bb248c133 Help: More cross references between CPackIFW and CPackIFWGenerator. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4356
| * | | | | | Help: CPack IFW Generator: not only configures, but also runs QtIFW.Joachim Wuttke (o)2020-02-131-2/+5
| | | | | | |
| * | | | | | Help: More cross references between CPackIFW and CPackIFWGenerator.Joachim Wuttke (o)2020-02-131-16/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | And more concise section "QtIFW Tools".
* | | | | | Merge topic 'doc-install-dest'Brad King2020-02-141-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79e1d86d2c Help: command install: absolute paths unsupported by CPack Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4355
| * | | | | | Help: command install: absolute paths unsupported by CPackJoachim Wuttke (o)2020-02-121-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advise against absolute DESTINATIONs as they are not supported by CPack installer generators.
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-141-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-02-131-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.17'Brad King2020-02-120-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'doc-ascii' into release-3.17Brad King2020-02-122-4/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4358
* | | | | | Merge topic 'doc-ascii'Brad King2020-02-122-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4358
| * | | | | Help: Replace UTF-8 apostrophe with ascii apostropheBrad King2020-02-122-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Also replace UTF-8 graphical characters with simple dashes. Fixes: #20349
* | | | | Merge branch 'release-3.17'Brad King2020-02-120-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | CMake 3.17.0-rc1v3.17.0-rc1Brad King2020-02-121-1/+1
| | | | |
* | | | | Merge topic 'ninja-strcat-usage'Kyle Edwards2020-02-122-151/+154
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e65b869c3 cmNinjaTargetGenerator: cmStrCat usage 9f6544048f cmGlobalNinjaGenerator: cmStrCat usage 04ac0ea501 cmGlobalNinjaGenerator: factor out /all target name computation a85bea173a cmGlobalNinjaGenerator: avoid unnecessary string addition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4347
| * | | | cmNinjaTargetGenerator: cmStrCat usageBen Boeckel2020-02-111-79/+81
| | | | |
| * | | | cmGlobalNinjaGenerator: cmStrCat usageBen Boeckel2020-02-111-57/+61
| | | | |
| * | | | cmGlobalNinjaGenerator: factor out /all target name computationBen Boeckel2020-02-111-14/+11
| | | | |
| * | | | cmGlobalNinjaGenerator: avoid unnecessary string additionBen Boeckel2020-02-111-1/+1
| | | | |
* | | | | Merge branch 'release-3.17'Brad King2020-02-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4353
* | \ \ \ \ Merge topic 'doc-cpack'Brad King2020-02-121-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4353
| * | | | | Help: module CPack: Make internal hyperlink target more uniqueBrad King2020-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | We already have a `.. _targets:` in `Help/command/install.rst`.
* | | | | | Merge branch 'release-3.17'Brad King2020-02-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-10/+31
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59e9f33d78 Help: module CPack: New section on targets. f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7). 4949e1261a Help: module CPack. Explain usage of the build targets. 72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1 c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4352
generated by cgit v0.12 at 2025-08-25 21:48:09 (GMT)