mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-22 15:58:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,430 Commits 2 Branches 403 Tags
c9292f56fc7917dc55e8807d03ffadcd5cb45a0e
Commit Graph

54430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot c9292f56fc CMake Nightly Date Stamp 2021-08-29 00:01:09 -04:00
Kitware Robot 9c8e25c5fd CMake Nightly Date Stamp 2021-08-28 00:01:10 -04:00
Kitware Robot 33d4ec1282 CMake Nightly Date Stamp 2021-08-27 00:01:10 -04:00
Kitware Robot aedfe6c923 CMake Nightly Date Stamp 2021-08-26 00:01:13 -04:00
Brad King e0a34750f8 Merge branch 'release-3.21' 2021-08-25 11:29:47 -04:00
Brad King 31c5700d43 CMake 3.21.2 v3.21.2 2021-08-25 10:17:05 -04:00
Brad King 9498a0fbc7 Merge branch 'release-3.21' 2021-08-25 09:59:47 -04:00
Brad King bd8a6e8abe Merge topic 'vs2022' 
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
 2021-08-25 09:59:47 -04:00
Brad King af71bdb601 Merge topic 'vs2022' into release-3.21 
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
 2021-08-25 09:59:46 -04:00
Brad King c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1 
Issue: #22339
 2021-08-25 09:47:30 -04:00
Brad King b0a24db270 Merge topic 'find-package-note' 
d7e521bcd3 Help: find_package: Tweak change description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6477
 2021-08-25 09:19:04 -04:00
Brad King 67d0d8b9d5 Merge topic 'darwin-wmake-jwasm-support' 
bf09145eb0 Enable Watcom WMake generator on Darwin
78f758a463 Use dashes for MASM flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6472
 2021-08-25 09:18:11 -04:00
Brad King e7fe4633b7 Merge branch 'release-3.21' 2021-08-25 09:14:25 -04:00
Brad King e4302d8c8d Merge branch 'release-3.20' into release-3.21 2021-08-25 09:14:15 -04:00
Brad King 385d6e33b9 Merge branch 'release-3.20' 2021-08-25 09:14:03 -04:00
Brad King 8b750951aa Merge branch 'release-3.21' 2021-08-25 09:12:23 -04:00
Brad King 78eff650fa Merge topic 'GNUInstallDirs-variable-named-0' 
49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6474
 2021-08-25 09:12:23 -04:00
Brad King eae5533ab3 Merge topic 'GNUInstallDirs-variable-named-0' into release-3.21 
49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6474
 2021-08-25 09:12:22 -04:00
Kitware Robot cb7edb1f4b CMake Nightly Date Stamp 2021-08-25 00:01:13 -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 fd64b84d15 Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20 
Merge-request: !6474
 2021-08-24 10:02:58 -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) d7e521bcd3 Help: find_package: Tweak change description 2021-08-23 20:02:08 -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
Ben Boeckel 49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference 
In some situations, it seems that the variable `0` is defined. In the
case found, it was set to `1`. This makes the detection of the missing
third argument bogus and unnecessarily triggers a warning.

This oversight was introduced in 229b5ee994 (GNUInstallDirs: Add dir
argument to GNUInstallDirs_get_absolute_install_dir, 2020-10-31) prior
to CMake 3.20's release cycle.
 2021-08-22 12:42:48 -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
Bradley Bell bf09145eb0 Enable Watcom WMake generator on Darwin 
Open Watcom v2 runs on Mac OS and is useful there for doing
cross-compilation.
 2021-08-20 20:35:40 -07:00
Bradley Bell 78f758a463 Use dashes for MASM flags 
Microsoft's tools traditionally uses slashes, but accept dashes as
well. If we use dashes, it becomes possible to use an alternative
MASM-compatible assembler such as JWasm.
 2021-08-20 20:28:37 -07: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