summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.17'Brad King2020-02-180-0/+0
|\
| * Merge topic 'update-kwsys' into release-3.17Brad King2020-02-182-6/+18
| |\ | | | | | | | | | | | | | | | | | | ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4361
* | \ Merge topic 'update-kwsys'Brad King2020-02-183-7/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f9111be36 Merge branch 'backport-kwsys-copy-fix' into update-kwsys ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion fc6eced05e Merge branch 'upstream-KWSys' into update-kwsys 96dd383ceb KWSys 2020-02-17 (3e117fe1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4361
| * \ \ Merge branch 'backport-kwsys-copy-fix' into update-kwsysBrad King2020-02-180-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursionBrad King2020-02-182-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWSys commit `ea77593a1` (SystemTools: CopyFileIfDifferent: Fix endless recursion, 2020-02-13) for the CMake 3.17 branch. Fixes: #20347
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-02-173-7/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-02-17 (3e117fe1)
| | * | | KWSys 2020-02-17 (3e117fe1)KWSys Upstream2020-02-173-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 3e117fe1e008aeca4a4f33a431b196848cc34e11 (master). Upstream Shortlog ----------------- Brad King (1): c2420a42 SystemTools: Revert "CopyFileIfDifferent: Ensure that source is a file" Julien Schueller (1): c3acc96d CMake: Fix psapi lib name on case-sensitive fs Sebastian Lipponer (2): 573713fa SystemTools: CopyFileIfDifferent: Ensure that source is a file ea77593a SystemTools: CopyFileIfDifferent: Fix endless recursion
* | | | | Merge topic 'doc-sections'Brad King2020-02-185-82/+116
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22aac6669b Help: install: use bullet lists to sort out target kinds b3f4d50348 Help: ifw.rst: Add toc; mv "Hints" section -> subsection of "Variables" c671966c20 Help: CPackComponent: Sectioning and rewording 05e56b1897 Help: FetchContent, ExternalProject: Command sections -> subsections Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4367
| * | | | | Help: install: use bullet lists to sort out target kindsJoachim Wuttke (o)2020-02-171-17/+24
| | | | | |
| * | | | | Help: ifw.rst: Add toc; mv "Hints" section -> subsection of "Variables"Joachim Wuttke (o)2020-02-171-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also explain `@ApplicationsDir@`, thanks to https://discourse.cmake.org/t/647/2 for help.
| * | | | | Help: CPackComponent: Sectioning and rewordingJoachim Wuttke (o)2020-02-171-34/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Insert section and subsection headers (because this is a very long doc page) * In the Introduction, first say that module is included automatically * Then start with operational definition of components * Remove duplications * Also reword the description of the command cpack_add_component
| * | | | | Help: FetchContent, ExternalProject: Command sections -> subsectionsJoachim Wuttke (o)2020-02-172-5/+11
| | | | | |
* | | | | | Merge topic 'doc-string'Brad King2020-02-181-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 466b138ea2 Help: string: regex match and replace is a subcase of Search&Replace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4368
| * | | | | | Help: string: regex match and replace is a subcase of Search&ReplaceJoachim Wuttke (o)2020-02-171-4/+6
| |/ / / / /
* | | | | | Merge topic 'deprecate-policy-old'Brad King2020-02-183-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c78ae16d81 Add deprecation warnings for policies CMP0071 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4369
| * | | | | | Add deprecation warnings for policies CMP0071 and belowBrad King2020-02-173-1/+19
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.10 and below to encourage projects to port away from setting policies to OLD.
* | | | | | Merge topic 'CPackNuGet-granular-errors'Brad King2020-02-181-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6c470997f CPack/NuGet: Provide more granular errors Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !4132
| * | | | | | CPack/NuGet: Provide more granular errorsYacoub Hossain2020-02-171-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address the problem of not knowing when cpack fails to create a nuget package which occurs when creating multiple nupkgs. Fixes: #20094
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-180-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'swift-exe-rpath' into release-3.17Brad King2020-02-181-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 321df5783d Swift: support `-rpath` for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4365
* | \ \ \ \ \ \ Merge topic 'swift-exe-rpath'Brad King2020-02-181-0/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 321df5783d Swift: support `-rpath` for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4365
| * | | | | | | Swift: support `-rpath` for executablesSaleem Abdulrasool2020-02-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adjusts the flags to enable setting the RPATH for executables.
* | | | | | | | Merge branch 'release-3.17'Brad King2020-02-180-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'ninja-multi-framework-dependency-autogen-fix' into release-3.17Brad King2020-02-1829-87/+152
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4363
* | \ \ \ \ \ \ \ 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
| | |/ / / / / / | |/| | | | | |
generated by cgit v0.12 at 2025-01-20 07:55:20 (GMT)