mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 13:48:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
59,592 Commits 2 Branches 401 Tags
9da542d5c1c983b9ea608b7fc04d75826278564f
Commit Graph

59592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasiliy Koyrev 9da542d5c1 string(TIMESTAMP): Add %z and %Z for adding time zone string 
Fixes: #24056
 2022-10-27 11:13:46 -04:00
Brad King 2954a810ce Merge topic 'tutorial_step6_update' 
6e58a01f4e Tutorial: Update step 6 style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7756
 2022-10-27 09:45:48 -04:00
Brad King 532c88a5ed Merge topic 'sphinx-parallel' 
d78bfa1ecc Utilities/Sphinx: support cmakedomain running in parallel

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7822
 2022-10-27 09:45:05 -04:00
Brad King 77c1e6a63d Merge branch 'release-3.25' 2022-10-27 09:43:39 -04:00
Brad King ab88011579 Merge topic 'cmake-presets-workflow-arguments' 
7ecbe324b0 cmake --workflow: add --fresh option
7d9aa0f00c cmake::Workflow: Refactor to use enum class argument
322193afcd cmake --workflow: print usage and exit on unrecognized argument
70aef29427 cmake --workflow: print usage message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7825
 2022-10-27 09:43:39 -04:00
Brad King 33d610a076 Merge topic 'cmake-presets-workflow-arguments' into release-3.25 
7ecbe324b0 cmake --workflow: add --fresh option
7d9aa0f00c cmake::Workflow: Refactor to use enum class argument
322193afcd cmake --workflow: print usage and exit on unrecognized argument
70aef29427 cmake --workflow: print usage message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7825
 2022-10-27 09:43:38 -04:00
Brad King 5eab7ea84b Merge branch 'release-3.25' 2022-10-27 09:42:03 -04:00
Brad King ca80e8bdf6 Merge topic 'xcode-swift-defs' 
c0dd3dd2c1 Xcode: Evaluate Swift compile definitions separately

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7826
 2022-10-27 09:42:03 -04:00
Brad King 7d181917de Merge topic 'xcode-swift-defs' into release-3.25 
c0dd3dd2c1 Xcode: Evaluate Swift compile definitions separately

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7826
 2022-10-27 09:42:02 -04:00
Brad King b16acc202a Merge branch 'release-3.25' 2022-10-27 09:40:31 -04:00
Brad King a7adece911 Merge topic 'tutorial_my_math_consistency' 
277fbb3035 Tutorial: Restore USE_MYMATH in place of MY_MATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7829
 2022-10-27 09:40:31 -04:00
Brad King 4e80c6eff5 Merge topic 'tutorial_my_math_consistency' into release-3.25 
277fbb3035 Tutorial: Restore USE_MYMATH in place of MY_MATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7829
 2022-10-27 09:40:30 -04:00
Brad King 95373fd384 Merge branch 'release-3.25' 2022-10-27 09:39:10 -04:00
Brad King 4bba3124bc Merge topic 'vs-nostdlib-flag-table' 
9c33824474 VS: Fix MSBuild property for nostdlib flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7823
 2022-10-27 09:39:10 -04:00
Brad King b885a07ba2 Merge topic 'vs-nostdlib-flag-table' into release-3.25 
9c33824474 VS: Fix MSBuild property for nostdlib flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7823
 2022-10-27 09:39:09 -04:00
Brad King bb1c595a49 Merge branch 'release-3.25' 2022-10-27 09:30:18 -04:00
Brad King 072e8c1119 Merge branch 'release-3.24' 2022-10-27 09:30:16 -04:00
Brad King f70b4e8be8 Merge branch 'release-3.23' 2022-10-27 09:30:15 -04:00
Brad King c080b80e9a Merge branch 'release-3.24' into release-3.25 2022-10-27 09:30:04 -04:00
Brad King ae208c461a Merge branch 'release-3.25' 2022-10-27 09:29:13 -04:00
Brad King 12ca3c14a5 Merge topic 'cpack-trace-argument' 
b5ebaa0d9c CPack: Require no argument for --trace and --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7824
 2022-10-27 09:29:13 -04:00
Brad King f6034c5f6f Merge topic 'cpack-trace-argument' into release-3.25 
b5ebaa0d9c CPack: Require no argument for --trace and --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7824
 2022-10-27 09:29:12 -04:00
Brad King ee085de788 Merge branch 'release-3.25' 2022-10-27 09:28:08 -04:00
Brad King 643c05b1e2 Merge topic 'vswhere-support-x86' 
6eee8c9000 VS: Fix crash finding vswhere on 32-bit Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7832
 2022-10-27 09:28:08 -04:00
Brad King fdabb69e2e Merge topic 'vswhere-support-x86' into release-3.25 
6eee8c9000 VS: Fix crash finding vswhere on 32-bit Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7832
 2022-10-27 09:28:07 -04:00
Brad King 49c45d8ee8 Merge branch 'release-3.25' 2022-10-27 09:26:36 -04:00
Brad King fa040cedad Merge topic 'ninja-intl-paths' 
a12050666c Tests: Add case for ninja with non-ascii chars
02a04dd9c7 Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7833
 2022-10-27 09:26:36 -04:00
Brad King 74057c72d6 Merge topic 'ninja-intl-paths' into release-3.25 
a12050666c Tests: Add case for ninja with non-ascii chars
02a04dd9c7 Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7833
 2022-10-27 09:26:34 -04:00
Brad King ae917dc682 Merge branch 'cpack-trace-argument' into release-3.24 
Merge-request: !7824
 2022-10-27 09:25:24 -04:00
Brad King 77e4042204 Merge branch 'vswhere-support-x86' into release-3.24 
Merge-request: !7832
 2022-10-27 09:25:08 -04:00
Brad King 93a54db04e Merge branch 'release-3.23' into release-3.24 2022-10-27 09:25:02 -04:00
Brad King e677cc421d Merge branch 'ninja-intl-paths' into release-3.24 
Merge-request: !7833
 2022-10-27 09:24:46 -04:00
Brad King cd5826ffc9 Merge branch 'ninja-intl-paths' into release-3.23 
Merge-request: !7833
 2022-10-27 09:24:29 -04:00
Kitware Robot f2432780b3 CMake Nightly Date Stamp 2022-10-27 00:01:05 -04:00
Brad King a12050666c Tests: Add case for ninja with non-ascii chars 
Issue: #24089
 2022-10-26 15:25:45 -04:00
Brad King 02a04dd9c7 Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10 
Revert commit bbdb000c55 (GlobalNinjaGenerator: enlarge file stream
buffer, 2022-01-25, v3.23.0-rc1~68^2).  Somehow `rdbuf()->pubsetbuf()`
is resetting our imbued locale and `cm_codecvt` that handles encoding.

Fixes: #24089
 2022-10-26 15:24:43 -04:00
Kyle Edwards 7ecbe324b0 cmake --workflow: add --fresh option 
Fixes: #24073
 2022-10-26 12:01:25 -04:00
Kyle Edwards 7d9aa0f00c cmake::Workflow: Refactor to use enum class argument 2022-10-26 12:01:01 -04:00
Kyle Edwards 322193afcd cmake --workflow: print usage and exit on unrecognized argument 
Issue: #24073
 2022-10-26 12:00:57 -04:00
Brad King 6eee8c9000 VS: Fix crash finding vswhere on 32-bit Windows 
Since commit f85913fa08 (VS: Add support for enumerating VS instances
with vswhere, 2022-04-11, v3.24.0-rc1~282^2), if the COM lookup does not
report any VS instances, we fall back to finding vswhere.  However, the
`getenv` call returns nullptr if the `ProgramFiles(x86)` environment
variable is not set.  Update the logic to tolerate not-set environment
variables.  Also check the plain `ProgramFiles` environment variable.

Fixes: #24090
 2022-10-26 11:12:46 -04:00
Kitware Robot fd57ced75a CMake Nightly Date Stamp 2022-10-26 00:01:19 -04:00
Markus Ferrell 277fbb3035 Tutorial: Restore USE_MYMATH in place of MY_MATH 
In commit 80f5d28813 (Tutorial: Update step 2 style, 2022-07-25,
v3.25.0-rc1~226^2) we replaced some uses of `USE_MYMATH` with `MY_MATH`.
Restore the former name for consistency with the rest of the tutorial.
 2022-10-25 16:31:38 -04:00
Brad King 8e64edf1b5 Merge branch 'release-3.25' 2022-10-25 14:27:12 -04:00
Brad King cdd0bc237e Merge branch 'release-3.24' 2022-10-25 14:27:10 -04:00
Brad King 19262e23dd Merge branch 'release-3.23' 2022-10-25 14:27:09 -04:00
Brad King d0451d1a67 Merge branch 'release-3.24' into release-3.25 2022-10-25 14:27:02 -04:00
Brad King 2f673feb71 Merge branch 'release-3.25' 2022-10-25 14:26:19 -04:00
Brad King eab9ddb744 Merge topic 'try_compile-CMP0128' 
90287792b6 Tests: Avoid running C++11 test on GNU < 4.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7821
 2022-10-25 14:26:18 -04:00
Brad King 883798edc4 Merge topic 'try_compile-CMP0128' into release-3.25 
90287792b6 Tests: Avoid running C++11 test on GNU < 4.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7821
 2022-10-25 14:26:17 -04:00
Brad King c0dd3dd2c1 Xcode: Evaluate Swift compile definitions separately 
Xcode has a separate setting for Swift compile definitions, so we can
compute a dedicated value for it.  Therefore we can:

* Support the COMPILE_LANGUAGE generator expression for Swift-specific
  filters.

* Avoid passing the `=value` part of definitions, which Swift does
  not support.

This revises commit 5cb625eb2f (Xcode: Pass compile definitions to
Swift, 2022-06-19, v3.25.0-rc1~493^2) and reverts commit 12c6fec6b4
(Xcode: Drop CMAKE_INTDIR= definition in Swift targets, 2022-09-30,
v3.25.0-rc1~60^2~2), as the latter is no longer needed.

Fixes: #24086
 2022-10-25 14:09:28 -04:00