summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bootstrap: test -a|o is not POSIXIssam E. Maghni2020-12-231-5/+4
|
* Merge topic 'FindGTK2-atkmmconfig'Brad King2020-12-231-0/+1
|\ | | | | | | | | | | | | 9e5e312210 FindGTK2: Find atkmmconfig.h separately from atkmm.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5645
| * FindGTK2: Find atkmmconfig.h separately from atkmm.hJani Välimaa2020-12-221-0/+1
| | | | | | | | | | | | | | The former may be installed into libdir instead of includedir. We already do this for several other components. Fixes: #21627
* | Merge topic 'cpack-nuget-linux'Brad King2020-12-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | dade75509f CPack/NuGet: Fix nuspec file generation for UNIX-style OS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5640
| * | CPack/NuGet: Fix nuspec file generation for UNIX-style OSiorikyu2020-12-221-1/+1
| | | | | | | | | | | | Use forward slashes, which should work on both UNIX and Windows.
* | | Merge topic 'editorconfig'Brad King2020-12-232-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c14c6bd0b Add .editorconfig file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Merge-request: !5629
| * | | Add .editorconfig fileDaan De Meyer2020-12-212-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A .editorconfig file allows many editors (e.g. Visual Studio Code) to autoconfigure themselves based on its contents. This avoids some formatting issues in PRs because editors will do the right thing by default with a .editorconfig file available in the repo.
* | | | Merge branch 'release-3.19'Brad King2020-12-230-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'rel-linux-aarch64' into release-3.19Brad King2020-12-2314-13/+406
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary 76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries 595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bruno Verachten <gounthar@gmail.com> Merge-request: !5538
* | \ \ \ \ Merge topic 'rel-linux-aarch64'Brad King2020-12-2314-13/+406
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cf6941f37 Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64 fe1bd15ad7 gitlab-ci: add jobs to make Linux release packages for aarch64 24247155af Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64 2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary 76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries 595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bruno Verachten <gounthar@gmail.com> Merge-request: !5538
| * \ \ \ \ \ Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64Brad King2020-12-221-0/+5
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Help: Add 3.19.3 release note for Linux aarch64 binaryBrad King2020-12-221-0/+5
| | | | | | |
| | * | | | | gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branchHi Key2020-12-224-7/+53
| | | | | | |
| * | | | | | gitlab-ci: add jobs to make Linux release packages for aarch64Hi Key2020-12-224-7/+53
| | | | | | |
| * | | | | | Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64Brad King2020-12-2210-7/+349
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Utilities/Release: Add docker specs for Linux aarch64 binariesHi Key2020-12-229-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base them on the existing `x86_64` specs. Update the centos base image from centos 6 to centos 7 to get aarch64 support. The resulting binaries require GLIBC 2.17. Fixes: #17923
| | * | | | | gitlab-ci: consolidate Linux release package job spec for x86_64Brad King2020-12-221-7/+2
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-12-231-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.19'Craig Scott2020-12-220-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'fc-relative-SOURCE_DIR' into release-3.19Craig Scott2020-12-224-1/+17
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5641
* | | | | | | Merge topic 'fc-relative-SOURCE_DIR'Craig Scott2020-12-224-1/+17
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | 51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5641
| * | | | | FetchContent: Relative SOURCE_DIR override cannot be a hard errorCraig Scott2020-12-224-1/+17
| | | | | | | | | | | | | | | | | | Fixes: #21624
* | | | | | Merge branch 'release-3.19'Brad King2020-12-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'test-ConfigSources-config' into release-3.19Brad King2020-12-221-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5643
* | | | | | Merge topic 'test-ConfigSources-config'Brad King2020-12-221-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | 3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5643
| * | | | Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPEBrad King2020-12-221-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | The test requires a non-empty `CMAKE_BUILD_TYPE` to function on single-config generators. Force a non-empty configuration if the test is configured explicitly with empty `-DCMAKE_BUILD_TYPE=`.
* | | | Merge topic 'external-project-drop-success'Brad King2020-12-221-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 850de767e9 ExternalProject: Silence step succeeded message when using Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5625
| * | | | ExternalProject: Silence step succeeded message when using NinjaDaan De Meyer2020-12-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing an ExternalProject superbuild with all output logged to files, the output currently looks as follows: ``` [652/904] Performing install step for 'plasma-framework' -- plasma-framework install command succeeded. See also /root/build/kde/frameworks/plasma-framework/log/plasma-framework-install-*.log [658/904] Performing build step for 'khtml' -- khtml build command succeeded. See also /root/build/kde/frameworks/khtml/log/khtml-build-*.log [659/904] Performing install step for 'khtml' -- khtml install command succeeded. See also /root/build/kde/frameworks/khtml/log/khtml-install-*.log [661/904] Performing configure step for 'krunner' -- krunner configure command succeeded. See also /root/build/kde/frameworks/krunner/log/krunner-configure-*.log [661/904] Performing build step for 'krunner' ``` More specifically, because a success line is printed for every succeeded step, we lose the advantage of Ninja's progress bar which will now also print a new line instead of updating the same link as happens when using Ninja in a normal CMake project. By silencing the success message when using the Ninja generator, Ninja's progress bar works as expected and updates inline instead of printing a new line for each progress update. With this change, the above output is reduced to a single line progress bar: ``` [661/904] Performing build step for 'krunner' ```
* | | | | Merge topic 'issue-20134'Brad King2020-12-229-5/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b68699b717 target_include_directories: Support AFTER option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5633
| * | | | | target_include_directories: Support AFTER optionAsit Dhal2020-12-199-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20134
* | | | | | Merge topic 'issue-15653'Brad King2020-12-2229-18/+339
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3385dd8bd file(GENERATE): Support options to manipulate file permissions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5437
| * | | | | | file(GENERATE): Support options to manipulate file permissionsAsit Dhal2020-12-2129-18/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #15653
* | | | | | | Merge topic 'doc-add_test-config-genex'Brad King2020-12-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af7882ba6e Help: replace deprecated $<CONFIGURATION> generator expression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5636
| * | | | | | | Help: replace deprecated $<CONFIGURATION> generator expressionNeroBurner2020-12-211-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `$<CONFIGURATION>` genex has been deprecated since CMake 3.0. Use `$<CONFIG>` instead in the `add_test` example.
* | | | | | | Merge topic 'create_test_sourcelist-typo'Brad King2020-12-222-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0273293047 create_test_sourcelist: fix typo in placeholder name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5632
| * | | | | | | create_test_sourcelist: fix typo in placeholder nameSergey Bronnikov2020-12-212-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Rename `CMAKE_FUNCTION_TABLE_{ENTIRES => ENTRIES}`.
* | | | | | | Merge topic 'FindOpenSSL-win-arch'Brad King2020-12-221-5/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6e03b2e6f FindOpenSSL: Distinguish 32-bit and 64-bit search paths on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5630
| * | | | | | | FindOpenSSL: Distinguish 32-bit and 64-bit search paths on WindowsMa Br2020-12-211-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21611
* | | | | | | | Merge topic 'apple-missing-framework'Brad King2020-12-226-13/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ab77201f7 Apple: Fix linking to frameworks that do not exist until build time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5638
| * | | | | | | | Apple: Fix linking to frameworks that do not exist until build timeBrad King2020-12-216-13/+37
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #21621
* | | | | | | | CMake Nightly Date StampKitware Robot2020-12-221-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'ctest-test-dir'Brad King2020-12-2110-2/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbcf86d24d Ctest: Support build tree on command line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5623
| * | | | | | | Ctest: Support build tree on command lineAsit Dhal2020-12-1710-2/+64
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #21268
* | | | | | | Merge topic 'make-CMAKE_EXECUTABLE_FORMAT-internal'Brad King2020-12-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc8162a981 CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNAL Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5627
| * | | | | | | CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNALCraig Scott2020-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21607
* | | | | | | | Merge branch 'release-3.19'Brad King2020-12-210-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge topic 'revert-write-through' into release-3.19Brad King2020-12-211-2/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92021198e5 cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5628
* | \ \ \ \ \ \ \ Merge topic 'revert-write-through'Brad King2020-12-211-2/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92021198e5 cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5628
| * | | | | | | | cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on WindowsBrad King2020-12-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit d78c22aa64 (cmSystemTools: Improve RenameFile on Windows with MOVEFILE_WRITE_THROUGH, 2020-08-25, v3.19.0-rc1~243^2~3). Using this flag causes the operation to fail frequently in some environments. Drop it for now pending further investigation. Fixes: #21571
* | | | | | | | | Merge branch 'release-3.19'Craig Scott2020-12-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |