mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,303 Commits 2 Branches 401 Tags
eae125ace54bd82ed5be14cfee50f41a07b10619
Commit Graph

54303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brad King 7e3250da2f Merge topic 'cmProp-class' 
e5cd39ca80 cmProp: refactoring: transform alias in class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6420
 2021-08-09 09:46:47 -04:00
Brad King dc771bf1af Merge branch 'release-3.21' 2021-08-09 09:37:58 -04:00
Brad King 185e9d1619 Merge topic 'help_cmake_path' 
bb19af546b Help: cmake_path: add missing parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6431
 2021-08-09 09:37:58 -04:00
Brad King c949772c44 Merge topic 'help_cmake_path' into release-3.21 
bb19af546b Help: cmake_path: add missing parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6431
 2021-08-09 09:37:58 -04:00
Brad King e3bb5d2310 Merge branch 'release-3.21' 2021-08-09 09:36:58 -04:00
Brad King b5c4b70290 Merge topic 'nvhpc_support_new_c_and_c++_standards' into release-3.21 
9ac426e460 NVHPC-C: Add support for C17
f5dbc27c27 NVHPC-CXX: Add support for C++20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6430
 2021-08-09 09:36:58 -04:00
Brad King bd74ac95f1 Merge topic 'nvhpc_support_new_c_and_c++_standards' 
9ac426e460 NVHPC-C: Add support for C17
f5dbc27c27 NVHPC-CXX: Add support for C++20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6430
 2021-08-09 09:36:58 -04:00
Kitware Robot ec686f4c8a CMake Nightly Date Stamp 2021-08-09 00:01:33 -04:00
Marc Chevrier e5cd39ca80 cmProp: refactoring: transform alias in class 
To handle safely the values used by CMake variables and properties,
introduce the class cmProp as a replacement from the simple pointer
to std::string instance.
 2021-08-08 16:19:08 +02:00
Kitware Robot d1b2916bbb CMake Nightly Date Stamp 2021-08-08 00:01:10 -04:00
Kitware Robot cc94429c61 CMake Nightly Date Stamp 2021-08-07 00:01:15 -04:00
Brad King 350065bb85 Merge topic 'refactor-conditions-evaluation' 
54a70b3988 Refactor: Move version compare op table out of the function
f37d6a3170 Refactor: Remove redundant checks for `0` and `1` literals
00961a4782 Refactor: Copy exactly required count of args and avoid `pop_back()`
2a72cad9be Style: Better names of local vars for `IN_LIST` handler
0dd7795706 Refactor: Extract the logic of testing for special variable to func
866b0595f6 Refactor: Introduce `cmArgumentList` container class
51d9194a96 Refactor: Reduce one more condition checking on handling math compare
46810235e3 Refactor: Avoid `if` → `else if` → … for compare operators
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6392
 2021-08-06 12:12:02 -04:00
Michael Hirsch bb19af546b Help: cmake_path: add missing parameter 
for cmake_path(`CONVERT` ... [NORMALIZE]) was missing in top summary
 2021-08-06 11:55:53 -04:00
Brad King 86633cc203 Merge topic 'ninja-lwyu-ar' into release-3.21 
93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6418
 2021-08-06 10:55:48 -04:00
Brad King 07ecec3a80 Merge branch 'release-3.21' 2021-08-06 10:55:48 -04:00
Brad King 8e798c4ed8 Merge topic 'ninja-lwyu-ar' 
87589fd96a Merge branch 'backport-ninja-lwyu-ar' into ninja-lwyu-ar
93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6418
 2021-08-06 10:55:48 -04:00
Brad King c249cf8f60 Merge branch 'release-3.21' 2021-08-06 10:53:33 -04:00
Brad King f21ed57ecb Merge branch 'release-3.20' into release-3.21 2021-08-06 10:53:28 -04:00
Brad King 756950d1e6 Merge branch 'release-3.20' 2021-08-06 10:53:07 -04:00
Brad King 0d68cd5103 Merge branch 'release-3.21' 2021-08-06 10:48:21 -04:00
Brad King 50df0c411d Merge topic 'macos-10.4' 
1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6426
 2021-08-06 10:48:21 -04:00
Brad King ea8fc62194 Merge topic 'macos-10.4' into release-3.21 
1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6426
 2021-08-06 10:48:20 -04:00
Kitware Robot 1df8c88ea2 CMake Nightly Date Stamp 2021-08-06 00:01:10 -04:00
Robert Maynard 9ac426e460 NVHPC-C: Add support for C17 2021-08-05 16:19:23 -04:00
Robert Maynard f5dbc27c27 NVHPC-CXX: Add support for C++20 2021-08-05 16:19:12 -04:00
Kitware Robot 6c0f476505 CMake Nightly Date Stamp 2021-08-05 00:01:12 -04:00
Kitware Robot 85b5e6a458 CMake Nightly Date Stamp 2021-08-04 00:01:14 -04:00
Brad King 87589fd96a Merge branch 'backport-ninja-lwyu-ar' into ninja-lwyu-ar 2021-08-03 11:58:59 -04:00
Đoàn Trần Công Danh 93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries 
In commit d7159f9591, (Ninja: Fix LINK_WHAT_YOU_USE link flag placement,
2021-06-24), we fixed usage of -Wl,--no-as-needed to override
-Wl,--as-needed from LDFLAGS. However, that change also passes
-Wl,--no-as-needed to `ar`, which is incorrect flag for `ar`.

Let's check the target type before passing down the flags.

Fixes: #22487
 2021-08-03 11:21:26 -04:00
Brad King affd8b09e6 Merge topic 'vs10-deprecate' 
22dab6eb96 Deprecate Visual Studio 10 2010 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6412
 2021-08-03 11:10:43 -04:00
Brad King 792c2eac10 Merge topic 'irsl-intel' 
f4c194398d IRSL: Avoid duplication of Intel redist lib folder paths
2adc45c7f6 IRSL: Fix check of path to Intel redistdir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6414
 2021-08-03 11:09:42 -04:00
Brad King 70daea512d Merge topic 'string-TIMESTAMP-specifier-V' 
aafa392c12 string(TIMESTAMP): Add %V specifier for ISO 8601 week number
a915f691ad Help: Format string(TIMESTAMP) format specifiers as a definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6374
 2021-08-03 11:08:34 -04:00
Brad King a3ddcdb911 Merge topic 'nsis_ignore_license_page' 
795e406e3b CPack/NSIS: Add option to not display license page

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6422
 2021-08-03 11:06:45 -04:00
Brad King 1524505e12 Merge topic 'minimal_nsis' 
c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6425
 2021-08-03 11:05:39 -04:00
Brad King ff56e78bea Merge topic 'cpack_deb_zstd' 
051da997da CPack/DEB: Add zstd compression for deb packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6394
 2021-08-03 11:04:27 -04:00
Brad King 6edf3133ad Merge topic 'FindX11-more-advanced-variables' 
076d0a1710 FindX11: mark more xcb variables as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6424
 2021-08-03 11:03:35 -04:00
Brad King 64e8d23caf Merge topic 'gate-vtk-compat' 
7391363302 VTKCompatibility: ignore for "modern" VTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6413
 2021-08-03 11:02:23 -04:00
Brad King fbf5a368c9 Merge topic 'cpack-rpm-pre-semicolon' into release-3.21 
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
 2021-08-03 11:01:08 -04:00
Brad King 631e017f29 Merge branch 'release-3.21' 2021-08-03 11:01:08 -04:00
Brad King a6eadb8031 Merge topic 'cpack-rpm-pre-semicolon' 
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
 2021-08-03 11:01:08 -04:00
Brad King 54be23df7f Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into release-3.21 
213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6421
 2021-08-03 10:59:38 -04:00
Brad King 2d7015fd3e Merge branch 'release-3.21' 2021-08-03 10:59:38 -04:00
Brad King e251bf5f68 Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' 
9e7a0568f6 Merge branch 'backport-3.21-CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER
213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6421
 2021-08-03 10:59:38 -04:00
Brad King aa1426da4a Merge topic 'help-get_filename_path-fix-version-changed' into release-3.21 
8b28fe5670 Help: get_filename_component: fix version info for cmake_path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6423
 2021-08-03 10:57:44 -04:00