mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
56,420 Commits 2 Branches 385 Tags
14eb8a6ab98618fcf8550e1da2a8ff07b1aa26dc
Commit Graph

56420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
14eb8a6ab9 libarchive: Simplify hard-coded options for build within CMake 
Take advantage of policy CMP0077 NEW behavior to hard-code settings,
defined by `option()` calls in upstream libarchive, without adding
them to our cache.
 2022-02-22 17:51:18 -05:00
Brad King
d6b811fb82 Require CMake 3.13+ to configure CMake itself 
In particular, guarantee that policy `CMP0077` has `NEW` behavior.
This will be useful to hard-code options of third-party libraries
without polluting our own cache.
 2022-02-22 17:50:06 -05:00
Brad King
d985c12fa4 Merge topic 'ghs_build_event_bugfix' 
6acf06a2cd GHS: fix build event script error on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7002
 2022-02-22 12:59:05 -05:00
Brad King
6068143fe1 Merge topic 'update-kwsys' 
f634e77b2e Merge branch 'upstream-KWSys' into update-kwsys
8d9ced350d KWSys 2022-02-18 (599dc923)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7004
 2022-02-22 12:58:22 -05:00
Brad King
4878ad8f39 Merge branch 'release-3.23' 2022-02-22 12:56:51 -05:00
Brad King
8bbca4ecf9 Merge topic 'cuda-archs' 
f75299b803 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7007
 2022-02-22 12:56:51 -05:00
Brad King
2e963c41b4 Merge topic 'cuda-archs' into release-3.23 
f75299b803 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7007
 2022-02-22 12:56:50 -05:00
Brad King
e2587d6f5e Merge branch 'release-3.23' 2022-02-22 12:55:55 -05:00
Brad King
fec7867264 Merge topic 'CheckTypeSize-doc' 
65e4d29e35 CheckTypeSize: Modernize and clarify documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7006
 2022-02-22 12:55:55 -05:00
Brad King
e6a364c999 Merge topic 'CheckTypeSize-doc' into release-3.23 
65e4d29e35 CheckTypeSize: Modernize and clarify documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7006
 2022-02-22 12:55:54 -05:00
Craig Scott
f635f4ed05 Merge topic 'ep-REBASE_CHECKOUT-fallback' 
dec997f04e ExternalProject: Remove extra quotes in for-each-ref update step
704e87ee8c Help: Clarify behavior of REBASE_CHECKOUT when switching branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7011
 2022-02-22 07:36:05 -05:00
Kitware Robot
d8e3796368 CMake Nightly Date Stamp 2022-02-22 00:01:08 -05:00
Craig Scott
dec997f04e ExternalProject: Remove extra quotes in for-each-ref update step 
The --format=... argument to git for-each-ref was using a stray pair
of single quotes around the format string. These were then part of
the output, which caused it to never match the checkout_name.
The end result was that a REBASE_CHECKOUT always became a
CHECKOUT in all scenarios.

Fixes: #23216
 2022-02-21 18:28:46 +11:00
Craig Scott
704e87ee8c Help: Clarify behavior of REBASE_CHECKOUT when switching branches 
Issue: #23216
 2022-02-21 18:28:16 +11:00
Kitware Robot
7847a44930 CMake Nightly Date Stamp 2022-02-21 00:01:17 -05:00
Kitware Robot
cc8f5a7dbe CMake Nightly Date Stamp 2022-02-20 00:01:08 -05:00
Kitware Robot
6ff7cb3a80 CMake Nightly Date Stamp 2022-02-19 00:01:22 -05:00
Brad King
f75299b803 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+ 
Since commit 8f64df0a7c (CUDA: Generic all and all-major support,
2021-12-19, v3.23.0-rc1~23^2), setting `CUDA_ARCHITECTURES` to a value
other than `all` or `all-major` is ignored with NVCC 11.5+.  Fix the
logic to return early only when actually using an "all" value.

Fixes: #23243
 2022-02-18 12:54:12 -05:00
Brad King
65e4d29e35 CheckTypeSize: Modernize and clarify documentation 
Spell out the list of result variables as a definition list rather
than in prose.

Fixes: #23247
 2022-02-18 11:33:06 -05:00
Brad King
f634e77b2e Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-02-18 (599dc923)
 2022-02-18 09:20:57 -05:00
KWSys Upstream
8d9ced350d KWSys 2022-02-18 (599dc923) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 599dc923311452656b5497459076624d5716b5f2 (master).

Upstream Shortlog
-----------------

Dimitris Apostolou (1):
      b387faf8 Process: Fix typos
 2022-02-18 09:20:57 -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