summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Utilities/Git: add a file for refs to ignore when blamingBen Boeckel2022-02-211-0/+38
| | | | | | | | | | | | This file may be passed to `git blame` through either the `--ignore-revs-file` argument or the `blame.ignoreRevsFile` configuration to ignore certain commits when performing blames. Note that if Git is unable to find an older commit for a given line, commits in this file may still be given as the source of a line. The file uses features (namely empty lines and comments) which were added in Git 2.20, released Dec 2018.
* CMake Nightly Date StampKitware Robot2022-02-211-1/+1
|
* CMake Nightly Date StampKitware Robot2022-02-201-1/+1
|
* CMake Nightly Date StampKitware Robot2022-02-191-1/+1
|
* Merge topic 'revert-vs-zero_check-proj'Brad King2022-02-184-230/+31
|\ | | | | | | | | | | | | 4313c5acbc VS: Revert "Write ZERO_CHECK.proj for VS19 and above" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6999
| * VS: Revert "Write ZERO_CHECK.proj for VS19 and above"Brad King2022-02-174-230/+31
| | | | | | | | | | | | | | | | Revert commit 925da7d428 (VS: Write ZERO_CHECK.proj for VS19 and above, 2021-12-24). Although its commit message was mistakenly not updated, it implemented the change for VS 2017 and below too. Since it was merged, I've discovered several subtle failures in nightly testing with VS 2017. Revert the change pending further investigation.
* | Merge topic 'update-libarchive'Brad King2022-02-1876-1534/+3636
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be9ebc104a libarchive: Simplify code selecting CMake-specific build options 4a7a5718c6 libarchive: Update build within CMake after changes in 3.6.0 85cdeefc37 libarchive: include archive_platform.h first in blake2s sources b3644e460f Merge branch 'upstream-LibArchive' into update-libarchive 5d50940288 LibArchive 2022-02-09 (9147def1) 406503f620 libarchive: Update script to get 3.6.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6988
| * | libarchive: Simplify code selecting CMake-specific build optionsBrad King2022-02-172-34/+35
| | | | | | | | | | | | | | | Reduce differences from upstream libarchive `CMakeLists.txt` code. Remove modifications inside code we disable anyway.
| * | libarchive: Update build within CMake after changes in 3.6.0Brad King2022-02-163-1/+4
| | |
| * | libarchive: include archive_platform.h first in blake2s sourcesBrad King2022-02-162-2/+4
| | | | | | | | | | | | | | | | | | Move the inclusion added in 3.6.0 to be first. This is the libarchive convention in all other `.c` sources. It ensures that the configured `_WIN32_WINNT` value is defined before including any system headers.
| * | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2022-02-1573-1500/+3596
| |\ \ | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2022-02-09 (9147def1)
| | * | LibArchive 2022-02-09 (9147def1)LibArchive Upstream2022-02-1574-1532/+3630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 9147def1da7ad1bdd47b3559eb1bfeeb0e0f374b (v3.6.0).
| * | | libarchive: Update script to get 3.6.0Brad King2022-02-151-1/+1
| | | |
* | | | Merge topic 'typos'Brad King2022-02-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf204f209e ccmake: Fix typo in curses form comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6996
| * | | | ccmake: Fix typo in curses form commentDimitris Apostolou2022-02-171-1/+1
| | | | |
* | | | | Merge branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'correct_multiple_source_warnings' into release-3.23Brad King2022-02-189-5/+105
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7083b19498 cmake: When given multiple source paths use last instead of first Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7001
* | \ \ \ \ \ Merge topic 'correct_multiple_source_warnings'Brad King2022-02-189-5/+105
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7083b19498 cmake: When given multiple source paths use last instead of first Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7001
| * | | | | | cmake: When given multiple source paths use last instead of firstRobert Maynard2022-02-179-5/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given two source paths via `-S` or just directory paths prefer the last one. When the paths are mixed always prefer the last `-S` entry. Fixes: #23238
* | | | | | | Merge branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'file-set-no-exist' into release-3.23Brad King2022-02-183-21/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 058b8a0bfb install(): Properly ignore FILE_SETs that don't exist Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7000
* | \ \ \ \ \ \ Merge topic 'file-set-no-exist'Brad King2022-02-183-21/+27
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 058b8a0bfb install(): Properly ignore FILE_SETs that don't exist Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7000
| * | | | | | | install(): Properly ignore FILE_SETs that don't existKyle Edwards2022-02-173-21/+27
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #22960
* | | | | | | Merge branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-02-180-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2022-02-180-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'test-qt-disable' into release-3.22Brad King2022-02-171-4/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6998
* | \ \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'test-qt-disable' into release-3.23Brad King2022-02-181-4/+8
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6998
* | | | | | | | | Merge topic 'test-qt-disable'Brad King2022-02-181-4/+8
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6998
| * | | | | | | | Tests: Add missing guards on Qt4 and Qt5 testsBrad King2022-02-171-4/+8
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing `CMake_TEST_Qt{4,5}` conditions on Qt4 an Qt5 tests. Configuring CMake with `-DCMake_TEST_Qt5=OFF` should prevent any attempt to search for Qt5. Fixes: #23239
* | | | | | | | Merge branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'libarchive-openssl-crypto-checks' into release-3.23Brad King2022-02-181-0/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 483a1c248c libarchive: Fix OpenSSL crypto library checks for build inside CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6997
* | | | | | | | Merge topic 'libarchive-openssl-crypto-checks'Brad King2022-02-181-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 483a1c248c libarchive: Fix OpenSSL crypto library checks for build inside CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6997
| * | | | | | | libarchive: Fix OpenSSL crypto library checks for build inside CMakeBrad King2022-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libarchive's crypto library checks use its `config.h` inside the `try_compile` project. Since commit ade3b16e63 (libarchive: Use KWIML to get fixed-size integer types, 2020-06-01, v3.18.0-rc1~33^2), that header depends on KWIML inside CMake. Add the include directory for KWIML to the crypto library checks. Otherwise, they always fail due to not finding the KWIML headers, and libarchive decides not to link the crypto library. libarchive has other code besides the hash algorithms that depends on the crypto library if its ENABLE_OPENSSL option is enabled (which in CMake is controlled by CMAKE_USE_OPENSSL). It seems to be missing some conditions to link the crypto library in those cases, and instead relies on at least one of the above-mentioned checks to pass. If they all fail, and we are using system curl, we might not link the crypto library. Fixes: #23234
* | | | | | | | CMake Nightly Date StampKitware Robot2022-02-181-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'test-try_compile-bindir'Brad King2022-02-172-18/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b47c4d0cd Tests: Use idiomatic try_compile calls in TryCompile test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6995
| * | | | | | | Tests: Use idiomatic try_compile calls in TryCompile testBrad King2022-02-162-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not duplicate the `CMakeFiles/CMakeTmp` portion of the path. The `try_compile` command adds that automatically.
* | | | | | | | Merge topic 'LINK_LIBRARY-updates'Brad King2022-02-1747-211/+216
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397ee55cd6 genex-LINK_LIBRARY: rename configuration variables Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6994
| * | | | | | | | genex-LINK_LIBRARY: rename configuration variablesMarc Chevrier2022-02-1647-211/+216
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be more consistent between genex and variables as well as the forecomming LINK_GROUP genex, rename variable *_LINK_USING_<FEATURE>* in *_LINK_LIBRARY_USING_<FEATURE>*
* | | | | | | | Merge topic 'test-RunCMake-xcodebuild-incidental'Brad King2022-02-171-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ade07ef89 Tests: Teach RunCMake to ignore Xcode extension point warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6992
| * | | | | | | | Tests: Teach RunCMake to ignore Xcode extension point warningsBrad King2022-02-161-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] Requested but did not find extension point with identifier ... Teach RunCMake to drop such incidental lines before matching against expected output.
* | | | | | | | Merge branch 'release-3.23'Brad King2022-02-170-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cmake-empty-cmd-line-arg' into release-3.23Brad King2022-02-1715-6/+60
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f73457ca2e cmake: Ignore any empty "" command line arguments 67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6980
* | \ \ \ \ \ \ \ Merge topic 'cmake-empty-cmd-line-arg'Brad King2022-02-1715-6/+60
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f73457ca2e cmake: Ignore any empty "" command line arguments 67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6980
| * | | | | | | | cmake: Ignore any empty "" command line argumentsRobert Maynard2022-02-1614-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't treat empty quote arguments("") as the current working directory but instead ignore them. Fixes #23217
| * | | | | | | | Tests: Add RunCMake helper to run cmake with raw execute_process argsBrad King2022-02-161-2/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-02-170-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'test-cuda-sepcomp-ptx' into release-3.23Brad King2022-02-171-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6991
* | \ \ \ \ \ \ \ \ Merge topic 'test-cuda-sepcomp-ptx'Brad King2022-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6991