mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
59,614 Commits 2 Branches 401 Tags
6b27854d268381cb8d29a500caa2ff3b4fe7da3c
Commit Graph

59614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 6b27854d26 Merge topic 'tutorial_step7_update' 
f9ef15f3dc Tutorial: Update step 7 style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7787
 2022-10-28 10:03:10 -04:00
Brad King 907bfc661b Merge topic 'tutorial_step5_cleanup' 
43f87741f4 Tutorial: Fix Step 5 solution after update to Step 6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7838
 2022-10-28 10:02:20 -04:00
Brad King 4c034f1961 Merge branch 'release-3.25' 2022-10-28 10:00:05 -04:00
Brad King 5b9fc1062b Merge topic 'FindGLUT-pkg-config' 
919ab832e8 FindGLUT: Fix regression when pkg-config is not available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7840
 2022-10-28 10:00:04 -04:00
Brad King 59ae254316 Merge topic 'FindGLUT-pkg-config' into release-3.25 
919ab832e8 FindGLUT: Fix regression when pkg-config is not available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7840
 2022-10-28 10:00:03 -04:00
Brad King 27e07abc8b Merge branch 'release-3.25' 2022-10-28 09:58:53 -04:00
Brad King 9acf79f6f8 Merge topic 'vs-dotnet-sdk-output-paths' 
d2d1be0671 VS: Fix paths in multi-target SDK-style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7836
 2022-10-28 09:58:53 -04:00
Brad King 4910efb178 Merge topic 'vs-dotnet-sdk-output-paths' into release-3.25 
d2d1be0671 VS: Fix paths in multi-target SDK-style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7836
 2022-10-28 09:58:52 -04:00
Brad King dcd7686926 Merge branch 'release-3.25' 2022-10-28 09:52:37 -04:00
Brad King 2bc177b002 Merge topic 'xcode-restore-install-path' 
8d5631f0d0 Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7839
 2022-10-28 09:52:37 -04:00
Brad King 5d12374b51 Merge topic 'xcode-restore-install-path' into release-3.25 
8d5631f0d0 Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7839
 2022-10-28 09:52:36 -04:00
Craig Scott 204d277f39 Merge topic 'ep-srcdir-bindir-configure-args' 
6b6d593351 ExternalProject: Use -S and -B args to robustly set configure dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Alexey Edelev <alexey.edelev@qt.io>
Merge-request: !7837
 2022-10-28 07:31:37 -04:00
Craig Scott 50645917e5 Merge branch 'release-3.25' 2022-10-28 07:25:58 -04:00
Craig Scott e9a2a812a3 Merge topic 'doc-config-postfix' 
3fc2dcd801 Help: Minor formatting and cross-ref cleanup for <CONFIG>_POSTFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7841
 2022-10-28 07:25:58 -04:00
Craig Scott 37156dc47a Merge topic 'doc-config-postfix' into release-3.25 
3fc2dcd801 Help: Minor formatting and cross-ref cleanup for <CONFIG>_POSTFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7841
 2022-10-28 07:25:57 -04:00
Kitware Robot c59a955ad7 CMake Nightly Date Stamp 2022-10-28 00:01:06 -04:00
Craig Scott 3fc2dcd801 Help: Minor formatting and cross-ref cleanup for <CONFIG>_POSTFIX 2022-10-28 09:26:28 +11:00
Brad King 919ab832e8 FindGLUT: Fix regression when pkg-config is not available 
In commit a2fc4b6257 (FindGLUT: Drop the now-unnecessary exclusion of
pkg-config for multiconfig, 2022-10-13, v3.25.0-rc2~16^2) we
accidentally removed the entire condition around the `pkg-config` code
path instead of just the multi-config part.

Fixes: #24095
 2022-10-27 12:39:06 -04:00
Markus Ferrell 43f87741f4 Tutorial: Fix Step 5 solution after update to Step 6 
Since commit 6e58a01f4e (Tutorial: Update step 6 style, 2022-10-06) the
`literalinclude` included an extra comment from step 6 instructions.
Fix the include bounds to remove the extra text.
 2022-10-27 11:30:46 -04:00
Brad King 8d5631f0d0 Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY" 
The change in commit 61acaa12af (xcode: Don't set INSTALL_PATH unless
target is SHARED_LIBRARY, 2022-07-14, v3.25.0-rc1~291^2) breaks some
existing use cases.  Revert it pending further investigation.

Fixes: #24087
Issue: #15183
 2022-10-27 10:28:39 -04:00
Markus Ferrell f9ef15f3dc Tutorial: Update step 7 style 2022-10-27 10:08:56 -04:00
Sebastian Maisch d2d1be0671 VS: Fix paths in multi-target SDK-style projects 
Set the `AppendTargetFrameworkToOutputPath` property to `false` only for
single target SDK-style projects.  This prevents outputs from being
overwritten during the build.  This revises commit 7671d71299 (VS: Fix
target output paths in SDK-style projects, 2022-09-23, v3.25.0-rc1~82^2).

Fixes: #24094
Issue: #23989
 2022-10-27 09:58:09 -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