summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Fix terminology for regular expression in if(MATCHES)Johel Ernesto Guerrero Peña2021-08-281-1/+1
| | | | | This was wrongly changed in commit ba90611225 (Help: Make synopsis of if command more compact; add section headers, 2018-10-05).
* CMake Nightly Date StampKitware Robot2021-08-271-1/+1
|
* CMake Nightly Date StampKitware Robot2021-08-261-1/+1
|
* Merge branch 'release-3.21'Brad King2021-08-250-0/+0
|\
| * CMake 3.21.2v3.21.2Brad King2021-08-251-1/+1
| |
* | Merge branch 'release-3.21'Brad King2021-08-250-0/+0
|\ \ | |/
| * Merge topic 'vs2022' into release-3.21Brad King2021-08-252-3/+6
| |\ | | | | | | | | | | | | | | | | | | c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6480
* | \ Merge topic 'vs2022'Brad King2021-08-252-3/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6480
| * | VS: Update Visual Studio 17 2022 generator for Preview 3.1Brad King2021-08-252-3/+6
| |/ | | | | | | Issue: #22339
* | Merge topic 'find-package-note'Brad King2021-08-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | d7e521bcd3 Help: find_package: Tweak change description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6477
| * | Help: find_package: Tweak change descriptionFeRD (Frank Dana)2021-08-241-1/+1
| | |
* | | Merge topic 'darwin-wmake-jwasm-support'Brad King2021-08-252-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Enable Watcom WMake generator on DarwinBradley Bell2021-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | Open Watcom v2 runs on Mac OS and is useful there for doing cross-compilation.
| * | | Use dashes for MASM flagsBradley Bell2021-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'release-3.21'Brad King2021-08-250-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'release-3.20' into release-3.21Brad King2021-08-250-0/+0
| |\ \ \
* | \ \ \ Merge branch 'release-3.20'Brad King2021-08-250-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20Brad King2021-08-241-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6474
* | \ \ \ \ Merge branch 'release-3.21'Brad King2021-08-250-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'GNUInstallDirs-variable-named-0' into release-3.21Brad King2021-08-251-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6474
* | | | | | Merge topic 'GNUInstallDirs-variable-named-0'Brad King2021-08-251-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6474
| * | | | | GNUInstallDirs: avoid unwanted variable dereferenceBen Boeckel2021-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2021-08-251-1/+1
| | | | | |
* | | | | | Merge topic 'refactor-reduce-cmToCStr-usage'Brad King2021-08-2418-69/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a2a275bb4 Refactor: reduce cmToCStr usage 2984df9100 Refactor: cmHasPrefix and cmHasSuffix accept now cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6455
| * | | | | | Refactor: reduce cmToCStr usageMarc Chevrier2021-08-1917-69/+62
| | | | | | |
| * | | | | | Refactor: cmHasPrefix and cmHasSuffix accept now cmPropMarc Chevrier2021-08-191-0/+21
| | | | | | |
* | | | | | | Merge topic 'host-distro-info'Brad King2021-08-2442-218/+991
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmake_host_system_information: Make it available for all systemsAlex Turbov2021-08-204-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it was Linux only.
| * | | | | | | Refactor: Simplify `GetValue()` function callsAlex Turbov2021-08-201-15/+27
| | | | | | | |
| * | | | | | | cmake_host_system_information: Also set `USED_FALLBACK_SCRIPT`Alex Turbov2021-08-204-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the OS identification was obtained via fallback script.
| * | | | | | | cmake_host_system_information: Can run fallback scriptsAlex Turbov2021-08-2016-2/+308
| | | | | | | |
| * | | | | | | cmake_host_system_information: Can read `/etc/os-release` fileAlex Turbov2021-08-2014-7/+336
| | | | | | | |
| * | | | | | | Testing: Convert `cmake_host_system_information` tests into `RunCMake`Alex Turbov2021-08-0217-24/+62
| | | | | | | |
| * | | | | | | Documentation: Use definition list instead of tablesAlex Turbov2021-07-301-39/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform tables into definition list for `cmake_host_system_information` command manual.
| * | | | | | | Refactor: Deduplicate code for `VS_nn_DIR` keys processingAlex Turbov2021-07-301-48/+18
| | | | | | | |
| * | | | | | | Refactor: Use string viewAlex Turbov2021-07-301-29/+31
| | | | | | | |
| * | | | | | | Refactor: `bool GetValue(..., string&)` → `optional<string> GetValue(...)`Alex Turbov2021-07-301-70/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, split `GetValue()` into 2 overloads: - one used to get documented keys - the other (different signature) to get `VS_nn_DIR` keys
| * | | | | | | Refactor: Move module private functions on topAlex Turbov2021-07-281-62/+54
| | | | | | | |
| * | | | | | | Refactor: Run CPU/OS/Memory tests once on first runAlex Turbov2021-07-271-4/+8
| | | | | | | |
* | | | | | | | Merge branch 'release-3.21'Brad King2021-08-240-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'vs-toolset-version' into release-3.21Brad King2021-08-241-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'vs-toolset-version'Brad King2021-08-241-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | VS: Add special case for '-T version=14.29.16.11' under VS 16.11Brad King2021-08-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-08-240-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'revert-autouic-header-depends' into release-3.21Brad King2021-08-2415-142/+82
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'revert-autouic-header-depends'Brad King2021-08-2415-142/+82
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | AUTOUIC: Revert "Fix generating of dependency rules for UI header files"Brad King2021-08-1915-142/+82
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-08-240-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindMPI-framework-not-a-compile-flag' into release-3.21Brad King2021-08-241-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'FindMPI-framework-not-a-compile-flag'Brad King2021-08-241-1/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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