mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 13:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,400 Commits 2 Branches 401 Tags
c737367e92ef4f1b4cefcc0ead4d3f36ee1cd957
Commit Graph

56400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King c737367e92 Tests: Print p4.log on server failure in CTest.UpdateP4 2022-02-22 13:53:26 -05:00
Brad King 787495bb74 Tests: Preemptively create test HOME .bazaar directory 
Occasionally one of the `CTest.UpdateBZR` tests fails with:

    bzr: ERROR: [...] File exists: '/.../Tests/CMakeFiles/TestHome/.bazaar'

Create the directory ahead of time to eliminate any chance of a
time-of-check-time-of-use race.
 2022-02-22 10:03:38 -05:00
Brad King 176407736e Merge topic 'revert-vs-zero_check-proj' 
4313c5acbc VS: Revert "Write ZERO_CHECK.proj for VS19 and above"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6999
 2022-02-18 09:05:44 -05:00
Brad King 0bd5685867 Merge topic 'update-libarchive' 
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
 2022-02-18 09:04:00 -05:00
Brad King f0af28eca4 Merge topic 'typos' 
cf204f209e ccmake: Fix typo in curses form comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6996
 2022-02-18 09:03:03 -05:00
Brad King a9b03e9e66 Merge branch 'release-3.23' 2022-02-18 09:01:22 -05:00
Brad King ee8cd65c76 Merge topic 'correct_multiple_source_warnings' 
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
 2022-02-18 09:01:22 -05:00
Brad King a1cb448580 Merge topic 'correct_multiple_source_warnings' into release-3.23 
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
 2022-02-18 09:01:21 -05:00
Brad King 3702f3524d Merge branch 'release-3.23' 2022-02-18 08:57:33 -05:00
Brad King 92b479fd1a Merge topic 'file-set-no-exist' 
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
 2022-02-18 08:57:32 -05:00
Brad King ae5f8684f9 Merge topic 'file-set-no-exist' into release-3.23 
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
 2022-02-18 08:57:31 -05:00
Brad King a0c9104c8e Merge branch 'release-3.23' 2022-02-18 08:54:33 -05:00
Brad King 590e2eb3fa Merge branch 'release-3.22' 2022-02-18 08:54:31 -05:00
Brad King a99c73852e Merge branch 'release-3.22' into release-3.23 2022-02-18 08:54:27 -05:00
Brad King 7cf753fe3f Merge branch 'release-3.23' 2022-02-18 08:52:50 -05:00
Brad King b0e6a82d0b Merge topic 'test-qt-disable' 
5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6998
 2022-02-18 08:52:49 -05:00
Brad King e9832cc298 Merge topic 'test-qt-disable' into release-3.23 
5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6998
 2022-02-18 08:52:48 -05:00
Brad King 9364180894 Merge branch 'release-3.23' 2022-02-18 08:51:55 -05:00
Brad King 535f79656e Merge topic 'libarchive-openssl-crypto-checks' 
483a1c248c libarchive: Fix OpenSSL crypto library checks for build inside CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6997
 2022-02-18 08:51:55 -05:00
Brad King abc12c4e96 Merge topic 'libarchive-openssl-crypto-checks' into release-3.23 
483a1c248c libarchive: Fix OpenSSL crypto library checks for build inside CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6997
 2022-02-18 08:51:54 -05:00
Kitware Robot 7aa751256d CMake Nightly Date Stamp 2022-02-18 00:01:21 -05:00
Robert Maynard 7083b19498 cmake: When given multiple source paths use last instead of first 
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
 2022-02-17 16:54:30 -05:00
Kyle Edwards 058b8a0bfb install(): Properly ignore FILE_SETs that don't exist 
Fixes: #22960
 2022-02-17 14:43:06 -05:00
Brad King 4313c5acbc VS: Revert "Write ZERO_CHECK.proj for VS19 and above" 
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.
 2022-02-17 11:23:02 -05:00
Brad King fa9bba4905 Merge branch 'test-qt-disable' into release-3.22 
Merge-request: !6998
 2022-02-17 11:11:20 -05:00
Brad King 5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests 
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
 2022-02-17 11:00:25 -05:00
Dimitris Apostolou cf204f209e ccmake: Fix typo in curses form comment 2022-02-17 08:55:56 -05:00
Brad King 77871555de Merge topic 'test-try_compile-bindir' 
4b47c4d0cd Tests: Use idiomatic try_compile calls in TryCompile test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6995
 2022-02-17 08:49:19 -05:00
Brad King 48933f5160 Merge topic 'LINK_LIBRARY-updates' 
397ee55cd6 genex-LINK_LIBRARY: rename configuration variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6994
 2022-02-17 08:48:28 -05:00
Brad King 4ee96f6e77 Merge topic 'test-RunCMake-xcodebuild-incidental' 
6ade07ef89 Tests: Teach RunCMake to ignore Xcode extension point warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6992
 2022-02-17 08:46:53 -05:00
Brad King ae9536d95a Merge branch 'release-3.23' 2022-02-17 08:45:53 -05:00
Brad King 9f1f443e83 Merge topic 'cmake-empty-cmd-line-arg' 
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
 2022-02-17 08:45:53 -05:00
Brad King 9c81f2cb8b Merge topic 'cmake-empty-cmd-line-arg' into release-3.23 
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
 2022-02-17 08:45:52 -05:00
Brad King 70d5a64dde Merge branch 'release-3.23' 2022-02-17 08:43:40 -05:00
Brad King 43511abb44 Merge topic 'test-cuda-sepcomp-ptx' 
a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6991
 2022-02-17 08:43:40 -05:00
Brad King ed9e7a2732 Merge topic 'test-cuda-sepcomp-ptx' into release-3.23 
a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6991
 2022-02-17 08:43:39 -05:00
Brad King 483a1c248c libarchive: Fix OpenSSL crypto library checks for build inside CMake 
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
 2022-02-17 08:06:01 -05:00
Brad King be9ebc104a libarchive: Simplify code selecting CMake-specific build options 
Reduce differences from upstream libarchive `CMakeLists.txt` code.
Remove modifications inside code we disable anyway.
 2022-02-17 07:28:09 -05:00
Kitware Robot e61cc03ebf CMake Nightly Date Stamp 2022-02-17 00:01:12 -05:00
Brad King 4b47c4d0cd Tests: Use idiomatic try_compile calls in TryCompile test 
Do not duplicate the `CMakeFiles/CMakeTmp` portion of the path.
The `try_compile` command adds that automatically.
 2022-02-16 13:28:12 -05:00
Marc Chevrier 397ee55cd6 genex-LINK_LIBRARY: rename configuration variables 
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>*
 2022-02-16 18:34:28 +01:00
Robert Maynard f73457ca2e cmake: Ignore any empty "" command line arguments 
Don't treat empty quote arguments("") as the current working
directory but instead ignore them.

Fixes #23217
 2022-02-16 12:11:33 -05:00
Brad King 67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args 2022-02-16 12:10:19 -05:00
Brad King 6ade07ef89 Tests: Teach RunCMake to ignore Xcode extension point warnings 
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.
 2022-02-16 11:21:54 -05:00
Brad King 1e495fdab9 Merge branch 'release-3.23' 2022-02-16 09:47:46 -05:00
Brad King 1659a6918a Merge topic 'tll-genex-concat' 
c1e812ad4f target_link_libraries: Improve tolerance of unquoted generator expressions
5571a31648 target_link_libraries: Handle keyword arguments in dedicated code path
42590df9f9 target_link_libraries: Remove likely-broken ancient compatibility check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6989
 2022-02-16 09:47:46 -05:00
Brad King 368dc57979 Merge topic 'tll-genex-concat' into release-3.23 
c1e812ad4f target_link_libraries: Improve tolerance of unquoted generator expressions
5571a31648 target_link_libraries: Handle keyword arguments in dedicated code path
42590df9f9 target_link_libraries: Remove likely-broken ancient compatibility check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6989
 2022-02-16 09:47:45 -05:00
Brad King 0de768be7a Merge branch 'release-3.23' 2022-02-16 09:43:57 -05:00
Brad King 625913b429 Merge branch 'release-3.22' 2022-02-16 09:43:55 -05:00
Brad King bd575a2918 Merge branch 'release-3.22' into release-3.23 2022-02-16 09:43:48 -05:00