mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,410 Commits 2 Branches 391 Tags
651ecdddfab8ba38decfa0b91333c8d27523c3ea
Commit Graph

54410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
651ecdddfa Utilities: Add hard-coded try_compile result for libarchive strnlen check 
libarchive 3.5.1 checks for strnlen.  It is available on all Windows
platforms.
 2021-08-24 12:53:59 -04:00
Brad King
107df8e650 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2020-12-26 (227a4b97)
 2021-08-24 10:13:10 -04:00
LibArchive Upstream
dadea0e5ce LibArchive 2020-12-26 (227a4b97) 
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 227a4b9719a7fbeba6ba46e377ff7d953f405cd5 (v3.5.1).
 2021-08-24 10:10:54 -04:00
Brad King
3d05964b02 libarchive: Update script to get 3.5.1 2021-08-24 10:09:59 -04:00
Brad King
71bf838cf3 Merge topic 'refactor-reduce-cmToCStr-usage' 
5a2a275bb4 Refactor: reduce cmToCStr usage
2984df9100 Refactor: cmHasPrefix and cmHasSuffix accept now cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6455
 2021-08-24 10:05:00 -04:00
Brad King
cf90aa5595 Merge topic 'host-distro-info' 
b9698f89df cmake_host_system_information: Make it available for all systems
5469c71a82 Refactor: Simplify `GetValue()` function calls
6c92f80f2e cmake_host_system_information: Also set `USED_FALLBACK_SCRIPT`
efe139d1b8 cmake_host_system_information: Can run fallback scripts
1e65e4a6e5 cmake_host_system_information: Can read `/etc/os-release` file
e808cbb1dd Testing: Convert `cmake_host_system_information` tests into `RunCMake`
9e831284e5 Documentation: Use definition list instead of tables
346f3de005 Refactor: Deduplicate code for `VS_nn_DIR` keys processing
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6410
 2021-08-24 10:04:15 -04:00
Brad King
91d5bf68ae Merge branch 'release-3.21' 2021-08-24 09:58:09 -04:00
Brad King
e9003cbcfe Merge topic 'vs-toolset-version' 
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6469
 2021-08-24 09:58:09 -04:00
Brad King
5a4847a0a4 Merge topic 'vs-toolset-version' into release-3.21 
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6469
 2021-08-24 09:58:08 -04:00
Brad King
2a4d1c8048 Merge branch 'release-3.21' 2021-08-24 09:57:10 -04:00
Brad King
ac0f76a748 Merge topic 'revert-autouic-header-depends' 
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6465
 2021-08-24 09:57:09 -04:00
Brad King
b2e2f5c196 Merge topic 'revert-autouic-header-depends' into release-3.21 
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6465
 2021-08-24 09:57:08 -04:00
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
Alex Turbov
b9698f89df cmake_host_system_information: Make it available for all systems 
Before it was Linux only.
 2021-08-20 09:35:12 -04:00
Alex Turbov
5469c71a82 Refactor: Simplify GetValue() function calls 2021-08-20 09:35:12 -04:00
Alex Turbov
6c92f80f2e cmake_host_system_information: Also set USED_FALLBACK_SCRIPT 
If the OS identification was obtained via fallback script.
 2021-08-20 09:35:12 -04:00
Alex Turbov
efe139d1b8 cmake_host_system_information: Can run fallback scripts 2021-08-20 09:35:12 -04:00
Alex Turbov
1e65e4a6e5 cmake_host_system_information: Can read /etc/os-release file 2021-08-20 09:35:09 -04:00
Kitware Robot
c8c257206b CMake Nightly Date Stamp 2021-08-20 00:01:13 -04:00
Brad King
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11 
Extend the table of special cases from commit 58a50a3a0a (VS: Fix '-T
version=14.28' under VS 16.9, 2021-03-11, v3.19.7~1^2~1) and updated by
commit a60141feaa (VS: Add special case for '-T version=14.29.16.10'
under VS 16.10, 2021-05-27, v3.20.4~11^2).  Add a special case for the
name VS 17 will use for VS 16.11's default toolset, so that it can be
used with VS 16.11 too.

Issue: #21922
 2021-08-19 14:57:30 -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
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files" 
Revert commit e5ec0e52f4 (AUTOUIC: Fix generating of dependency rules
for UI header files, 2021-07-22, v3.21.1~8^2) because it caused
regressions.  For example, changing one C++ source can now cause many
others to rebuild.  Revert the change pending further investigation.

Fixes: #22531
Issue: #16776
 2021-08-19 12:23:16 -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