mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-14 18:38:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,382 Commits 2 Branches 401 Tags
fff26cd8dc767fdca9ef07801d2b6a7ad85efb79
Commit Graph

54382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King fff26cd8dc Merge branch 'release-3.21' 2021-08-24 09:54:58 -04:00
Brad King 38dbf18bb1 Merge topic 'FindMPI-framework-not-a-compile-flag' 
2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6467
 2021-08-24 09:54:58 -04:00
Brad King 1dd9c96427 Merge topic 'FindMPI-framework-not-a-compile-flag' into release-3.21 
2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6467
 2021-08-24 09:54:57 -04:00
Brad King 4b613cd706 Merge topic 'archive-error-handling' 
20fec15204 cmArchiveWrite: Check for construction errors on Open
e2c06736e5 libarchive: Add missing cm3p prefixes on includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6470
 2021-08-24 09:52:44 -04:00
Brad King 56e242de24 Merge topic 'update-kwiml' 
845cdb7d41 Merge branch 'upstream-KWIML' into update-kwiml
1b8fefb505 KWIML 2021-08-20 (9c534d2c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6471
 2021-08-24 09:48:49 -04:00
Brad King 845cdb7d41 Merge branch 'upstream-KWIML' into update-kwiml 
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2021-08-20 (9c534d2c)
 2021-08-24 09:47:15 -04:00
KWIML Upstream 1b8fefb505 KWIML 2021-08-20 (9c534d2c) 
Code extracted from:

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

at commit 9c534d2cc5c3fece4184e8eaeda6f30d419db601 (master).

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

Brad King (1):
      9c534d2c int.h: Record that MSVC provides inttypes.h since VS 2013
 2021-08-24 09:47:13 -04:00
Craig Scott 600ca2ab1a Merge topic 'FetchContent_doc_restructure' 
e802193a34 Help: Rework docs to prioritize FetchContent_MakeAvailable()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6475
 2021-08-24 08:33:15 -04:00
Craig Scott 9f684521ab Merge topic 'get-property-syntax' 
0c0ba17493 Help: get/set_property: Fix SOURCE grammars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6476
 2021-08-24 08:28:04 -04:00
Kitware Robot bf969eb455 CMake Nightly Date Stamp 2021-08-24 00:01:10 -04:00
FeRD (Frank Dana) 0c0ba17493 Help: get/set_property: Fix SOURCE grammars 2021-08-23 18:38:13 -04:00
Craig Scott e802193a34 Help: Rework docs to prioritize FetchContent_MakeAvailable() 
FetchContent_MakeAvailable() should be strongly preferred over
the direct use of FetchContent_Populate(). The latter was the only
method available before CMake 3.14, but the former is simpler and
offers more functionality. Restructure the docs and improve the
wording to steer the reader toward `FetchContent_MakeAvailable()`
as the preferred approach.

Also take the opportunity to pull out the variables that influence
behavior into their own section. They were easily missed when
buried in the docs for the FetchContent_Populate() command.
 2021-08-23 21:47:03 +10:00
Kitware Robot 670e4bd9e9 CMake Nightly Date Stamp 2021-08-23 00:01:20 -04:00
Kitware Robot f28889ace7 CMake Nightly Date Stamp 2021-08-22 00:01:10 -04:00
Kitware Robot b76bf671d0 CMake Nightly Date Stamp 2021-08-21 00:01:12 -04:00
Brad King 20fec15204 cmArchiveWrite: Check for construction errors on Open 
Also update call sites to report the error.

Issue: #19666
 2021-08-20 11:23:20 -04:00
Brad King e2c06736e5 libarchive: Add missing cm3p prefixes on includes 
Issue: #20666
 2021-08-20 11:22:41 -04:00
Kitware Robot c8c257206b CMake Nightly Date Stamp 2021-08-20 00:01:13 -04:00
Ben Boeckel 2b2a6a7170 FindMPI: do not detect -framework as a compile flag 
MPICH 3.4.2 now reports `-framework OpenCL` as one of its compilation
flag. The compile flag extraction is seeing it as a generic `-f` flag
and misses its argument. This ends up with a compile option of
`-framework` which eats the next flag (and may be very important).

It does not seem that passing `-framework` as a link flag is necessary
at this time, so that is being actively ignored for now.

Fixes: #22555
 2021-08-19 13:09:39 -04:00
Brad King 2a4a630f3a Merge topic 'help_check' 
d62d0f048f Help: CheckFortranFunctionExists: recommend more general CheckSourceCompiles
8fddc2bb2f Help: refer to CheckSourceCompiles instead of older

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6446
 2021-08-19 10:31:25 -04:00
Brad King a82092f4a2 Merge topic 'fix_2.6_check' 
35e38ef97a Config File Gen: When requiring >= 2.6, don't check < 2.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6456
 2021-08-19 10:29:39 -04:00
Brad King ca1f5d5b9e Merge topic 'android-build-host' 
d1599c3f7f Fix build on Android (host)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6452
 2021-08-19 10:28:39 -04:00
Brad King 4bdaa6b927 Merge branch 'release-3.21' 2021-08-19 10:27:24 -04:00
Brad King 135e79038c Merge topic 'FindPkgConfig-restore-legacy-behavior' 
17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6461
 2021-08-19 10:27:24 -04:00
Brad King 30dd9b33a0 Merge topic 'FindPkgConfig-restore-legacy-behavior' into release-3.21 
17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6461
 2021-08-19 10:27:23 -04:00
Brad King 958b171c24 Merge branch 'release-3.21' 2021-08-19 10:26:18 -04:00
Brad King 76f1c9d598 Merge topic 'binutils-clang-fallback-ld' 
788b7afff2 FindBinUtils: Fall back to ld for Clang without lld

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6457
 2021-08-19 10:26:18 -04:00
Brad King daeb4f0f50 Merge topic 'binutils-clang-fallback-ld' into release-3.21 
788b7afff2 FindBinUtils: Fall back to ld for Clang without lld

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6457
 2021-08-19 10:26:17 -04:00
Brad King 0f67831ed3 Merge branch 'release-3.21' 2021-08-19 10:25:15 -04:00
Brad King a7daf30070 Merge topic 'CheckLanguage-CMP0126' into release-3.21 
89ed11ae6f CheckLanguage: Avoid CMP0126 warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6462
 2021-08-19 10:25:15 -04:00
Brad King 4aaddce2be Merge topic 'CheckLanguage-CMP0126' 
89ed11ae6f CheckLanguage: Avoid CMP0126 warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6462
 2021-08-19 10:25:15 -04:00
Brad King 39ce3b469f Merge branch 'release-3.21' 2021-08-19 10:23:32 -04:00
Brad King 7f6905630f Merge topic 'android-macos-arm64' into release-3.21 
164643fc39 Android: Fix NDK toolchain dir on arm64 mac

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6449
 2021-08-19 10:23:31 -04:00
Brad King 5dc9f53f50 Merge topic 'android-macos-arm64' 
164643fc39 Android: Fix NDK toolchain dir on arm64 mac

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6449
 2021-08-19 10:23:31 -04:00
Kitware Robot 5917b6277f CMake Nightly Date Stamp 2021-08-19 00:01:17 -04:00
Brad King 89ed11ae6f CheckLanguage: Avoid CMP0126 warning 
The macro's implementation converts a normal variable into a cache
variable intentionally, so both are set.  Explicitly set CMP0126 to NEW
to avoid a warning in trace mode.  This won't affect the module behavior
because the code path does not activate if a normal variable is already
defined anyway.

Fixes: #22548
 2021-08-18 15:25:49 -04:00
Marc Chevrier 17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW 
Module behavior must be independent from `CMP0126` policy.

Fixes: #22526
 2021-08-18 14:51:50 -04:00
Thomas Bernard 788b7afff2 FindBinUtils: Fall back to ld for Clang without lld 
If `lld` is not available, Clang can still use `ld`.

Fixes: #22500
 2021-08-18 14:31:21 -04:00
WangBin 164643fc39 Android: Fix NDK toolchain dir on arm64 mac 2021-08-18 14:09:33 -04:00
Brad King 1f3dceea57 Merge topic 'while-regression' 
eae125ace5 Refactor: Get rid of `isTrue` variable in the `while` block execution
4c1cdfd8f0 Refactor: Keep `cmWhileFunctionBlocker` members private
d22f68d019 Refactor: Transform `while` loop into `for`
e97e714f0d Fix: `while()` reports an error the same way as `if()`
880ca66b51 Fix: `while()` can silently ignore incorrect condition
61b33c3f4e Fix: Regression in the `cmConditionEvaluator::HandleLevel0`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6442
 2021-08-18 10:49:16 -04:00
Kitware Robot 881e76e7c5 CMake Nightly Date Stamp 2021-08-18 00:01:09 -04:00
Kitware Robot fa68fef6a7 CMake Nightly Date Stamp 2021-08-17 00:01:21 -04:00
Marcus Müller 35e38ef97a Config File Gen: When requiring >= 2.6, don't check < 2.5 
This seems to be a clear-cut case.

Signed-off-by: Marcus Müller <marcus@hostalia.de>
 2021-08-16 20:24:03 +02:00
Kitware Robot 0aa514297e CMake Nightly Date Stamp 2021-08-16 00:01:24 -04:00
Kitware Robot a3ea775aea CMake Nightly Date Stamp 2021-08-15 00:01:14 -04:00
Marc Chevrier 688b647238 Merge topic 'refactor-cmStandardLevelResolver_ComputeFeaturesAvailable-returns-cmProp' 
361b1ea4c7 Refactor: cmStandardLevelResolver::ComputeFeaturesAvailable returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6450
 2021-08-14 11:05:18 -04:00
Kitware Robot e06c1e84aa CMake Nightly Date Stamp 2021-08-14 00:01:10 -04:00
leha-bot d1599c3f7f Fix build on Android (host) 2021-08-13 21:32:49 +03:00
Kitware Robot 74d0629690 CMake Nightly Date Stamp 2021-08-13 00:01:26 -04:00
Marc Chevrier 361b1ea4c7 Refactor: cmStandardLevelResolver::ComputeFeaturesAvailable returns cmProp 2021-08-12 19:17:35 +02:00