mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,407 Commits 2 Branches 401 Tags
cb7edb1f4b46c391c9190ee24b850346dff2d83f
Commit Graph

31259 Commits

Author SHA1 Message Date
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 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
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
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
Kitware Robot 3fc3b43933 CMake Nightly Date Stamp 2021-08-12 00:01:15 -04:00
Brad King af495c51c1 Merge topic 'refactor-cmTest_GetProperty-returns-cmProp' 
97ed474431 Refactor: cmTest::GetProperty returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6438
 2021-08-11 09:31:44 -04:00
Brad King 1c5e27d470 Merge topic 'refactor-cmGeneratorTarget_GetSourcesProperty-returns-cmProp' 
e542116814 Refactor: cmGeneratorTarget::GetSourcesProperty returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6439
 2021-08-11 09:28:02 -04:00
Brad King c236dd37c9 Merge topic 'refactor-cmCommonTargetGenerator_GetFeature-returns-cmProp' 
791337f181 Refactor: cmCommonTargetGenerator::GetFeature returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6440
 2021-08-11 09:26:51 -04:00
Brad King f64ad3b97f Merge topic 'refactor-cmGlobalGenerator_GetGlobalSetting-returns-cmProp' 
3941b74de4 Refactor: cmGlobalGenerator::GetGlobalSetting returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6441
 2021-08-11 09:24:15 -04:00
Alex Turbov eae125ace5 Refactor: Get rid of isTrue variable in the while block execution 2021-08-11 08:57:45 -04:00
Alex Turbov 4c1cdfd8f0 Refactor: Keep cmWhileFunctionBlocker members private 
Particularly `Args`.
 2021-08-11 08:57:45 -04:00
Alex Turbov d22f68d019 Refactor: Transform while loop into for 
And reduce scope for some variables + use some more `auto`.
 2021-08-11 08:57:36 -04:00
Kitware Robot e0c40018b3 CMake Nightly Date Stamp 2021-08-11 00:01:14 -04:00
Brad King 8706f7a617 Merge topic 'symlinks-rebase-master' 
58d10cf6f1 Alternative symlink-creating mode for file(INSTALL ...)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6396
 2021-08-10 09:25:15 -04:00
Kitware Robot 438005a6e0 CMake Nightly Date Stamp 2021-08-10 00:01:15 -04:00
Alex Turbov e97e714f0d Fix: while() reports an error the same way as if() 
With arguments list expanded.
 2021-08-09 22:35:11 +03:00
Alex Turbov 880ca66b51 Fix: while() can silently ignore incorrect condition 
When `conditionEvaluator.IsTrue(...)` returns `false` it just
didn't print the error occured.
 2021-08-09 22:35:11 +03:00
Alex Turbov 61b33c3f4e Fix: Regression in the cmConditionEvaluator::HandleLevel0 
As reported in the BUG #22524, mismatched parenthesis reported differently
for `while()` and `if()`.

The problem was in the double loop (over "handlers" and the arguments),
where the outer loop didn't check the result of the running handler.
 2021-08-09 21:05:09 +03:00
Marc Chevrier 3941b74de4 Refactor: cmGlobalGenerator::GetGlobalSetting returns cmProp 2021-08-09 18:52:35 +02:00