mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-05 22:59:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,470 Commits 2 Branches 390 Tags
cdd2714dfa4d49b39d08da4e10dff5ea93304891
Commit Graph

31280 Commits

Author SHA1 Message Date
Kitware Robot
86ee38d756 CMake Nightly Date Stamp 2021-09-06 00:01:25 -04:00
Kitware Robot
9ab2e0e6f7 CMake Nightly Date Stamp 2021-09-05 00:01:09 -04:00
Kitware Robot
6d5452f1bc CMake Nightly Date Stamp 2021-09-04 00:01:13 -04:00
Brad King
eec847cca5 Merge topic 'ninja-armclang-windows' 
b6cf93472f Ninja: fix ARMClang paths for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6484
 2021-09-03 10:16:26 -04:00
Kitware Robot
a89ae726f4 CMake Nightly Date Stamp 2021-09-03 00:01:17 -04:00
Martin Kojtal
b6cf93472f Ninja: fix ARMClang paths for Windows 
We need to escape paths for ARMClang on Windows, see the referenced
issue for more details.

Fixes: #21093
 2021-09-02 11:40:17 -04:00
Marc Chevrier
80e0245e0e Merge topic 'enh-SetProperty-accepts-new-types' 
dc3aa4024e Refactor: Use new SetProperty signatures
6dfa581bab Enhancement: SetProperty accept cmProp or std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6478
 2021-09-02 03:42:31 -04:00
Kitware Robot
3078bf2063 CMake Nightly Date Stamp 2021-09-02 00:01:09 -04:00
Kitware Robot
2458541fb6 CMake Nightly Date Stamp 2021-09-01 00:01:12 -04:00
Kitware Robot
f94e4b8bb3 CMake Nightly Date Stamp 2021-08-31 00:01:10 -04:00
Kitware Robot
f3294e6523 CMake Nightly Date Stamp 2021-08-30 00:01:36 -04:00
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
31c5700d43 CMake 3.21.2 2021-08-25 10:17:05 -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
Marc Chevrier
dc3aa4024e Refactor: Use new SetProperty signatures 2021-08-25 10:09:10 +02:00
Marc Chevrier
6dfa581bab Enhancement: SetProperty accept cmProp or std::string 
Methods SetProperty of classes cmPropertyMap, cmStateDirectory
and cmMakefile accept now cmProp or std::string as argument.
 2021-08-25 10:09:02 +02: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
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
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
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
Kitware Robot
bf969eb455 CMake Nightly Date Stamp 2021-08-24 00:01:10 -04: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
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
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
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
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
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
Marc Chevrier
5a2a275bb4 Refactor: reduce cmToCStr usage 2021-08-19 10:49:30 +02:00
Marc Chevrier
2984df9100 Refactor: cmHasPrefix and cmHasSuffix accept now cmProp 2021-08-19 10:49:30 +02:00
Kitware Robot
5917b6277f CMake Nightly Date Stamp 2021-08-19 00:01:17 -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