mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
63,142 Commits 2 Branches 385 Tags
6576ca15f656459becccb1cdcde18c707e2ab339
Commit Graph

63142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
6576ca15f6 Merge topic 'mingw-search-prefixes' 
5e5132e1b1 MinGW: Search for packages in standard MSYSTEM environment prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8796
 2023-09-14 12:50:41 -04:00
Kitware Robot
dd282961b9 CMake Nightly Date Stamp 2023-09-14 00:01:12 -04:00
Brad King
7f5d5f6e5a Merge topic 'ninja-cc-local' 
0f16ebf333 cmNinjaTargetGenerator: Reduce lifetime of custom command list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8800
 2023-09-13 08:44:11 -04:00
Brad King
a8c50d6faf Merge topic 'orkun_21677_16_06_2023' 
09b650d000 Autogen: Move QtAutoMocDeps tests to RunCMake/Autogen
ebc9e448b3 Autogen: Add depfile support for Makefiles
e5358b9d8d RunCMake: Add RunCMake_TEST_NOT_EXPECT variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8570
 2023-09-13 08:42:55 -04:00
Brad King
6686caf74c Merge topic 'Findosg-doc' 
90c3357c67 Findosg*: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8798
 2023-09-13 08:42:08 -04:00
Brad King
3ebba48219 Merge branch 'release-3.27' 2023-09-13 08:41:11 -04:00
Brad King
3f8dc08ce5 Merge topic 'automoc-macro-names' 
42adf3cba8 Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8799
 2023-09-13 08:41:11 -04:00
Brad King
1608b0be49 Merge topic 'automoc-macro-names' into release-3.27 
42adf3cba8 Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8799
 2023-09-13 08:41:10 -04:00
Brad King
5e5132e1b1 MinGW: Search for packages in standard MSYSTEM environment prefixes 
MSYS2 and similar MinGW/MSYS distributions define development
environments with a `MSYSTEM` environment variable.  Each such
environment has a documented installation prefix for its packages,
often provided by a `MSYSTEM_PREFIX` environment variable.
Since commit 84a25fc263 (cmake_host_system_information: Add
MSYSTEM_PREFIX query, 2023-09-08) we can look up this prefix.

Add `$MSYSTEM_PREFIX/local` and `$MSYSTEM_PREFIX` to our system search
prefixes when targeting MinGW under `MSYSTEM` environments.  This is
their equivalent to `/usr/local` and `/usr`, which we search by default
on UNIX systems.

Issue: #24216
 2023-09-13 08:35:59 -04:00
Kitware Robot
8675a6ce40 CMake Nightly Date Stamp 2023-09-13 00:01:16 -04:00
Brad King
0f16ebf333 cmNinjaTargetGenerator: Reduce lifetime of custom command list 
Since commit 2583eff6fe (ninja: Factor out custom command order-only
depends, 2014-03-10, v3.1.0-rc1~559^2) we can store the list of custom
commands in a local variable rather than a member.
 2023-09-12 15:04:15 -04:00
Brad King
42adf3cba8 Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently 
In commit c5c3aff1f5 (Autogen: Add INTERFACE_AUTOMOC_MACRO_NAMES target
property, 2023-04-03, v3.27.0-rc1~197^2) we forgot to mark the property
as a usage requirement.  This is needed for efficient evaluation over
the target dependency closure.

Fixes: #25238
 2023-09-12 14:02:23 -04:00
權少
90c3357c67 Findosg*: Improve documentation formatting 
Add reST markup for inline literals, definition lists, and notes.
 2023-09-12 12:54:39 -04:00
Brad King
976659c846 Merge topic 'presets-schema' 
f1a7179520 presets: Add $schema property to JSON schema
f83771dfce presets: Add missing spaces in JSON schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8777
 2023-09-12 09:08:17 -04:00
Brad King
860f936c22 Merge branch 'release-3.27' 2023-09-12 09:06:15 -04:00
Brad King
93d813d87c Merge topic 'vs-cuda-object-libs' 
6ebff6ebf8 VS: Avoid unnecessary CUDA device linking for OBJECT libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8794
 2023-09-12 09:06:15 -04:00
Brad King
6f8746e27c Merge topic 'vs-cuda-object-libs' into release-3.27 
6ebff6ebf8 VS: Avoid unnecessary CUDA device linking for OBJECT libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8794
 2023-09-12 09:06:14 -04:00
Brad King
3a1f2b2051 Merge topic 'runcmake-pwd' 
34d46acfc8 Tests/RunCMake: Set $ENV{PWD} before each test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8795
 2023-09-12 08:03:42 -04:00
Brad King
bb3bdf4548 Merge topic 'Findosg-doc' 
57a0a16b58 Findosg*: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8792
 2023-09-12 08:00:06 -04:00
Brad King
a10ce3931a Merge topic 'pch-reuse-pdb-dependency' 
37d994294b PCH: Add missing dependency of REUSE_FROM shared compiler PDB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8787
 2023-09-12 07:59:10 -04:00
Brad King
5477afd920 Merge topic 'ninja-cmd' 
6ebf0e1a46 Ninja: Use absolute path to COMSPEC if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8747
 2023-09-12 07:58:09 -04:00
Brad King
c6e07514a1 Merge topic 'FindMatlab-version' 
8ea398a7af FindMatlab: Prefer to use VersionInfo.xml to get version, fallback to run

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8760
 2023-09-12 07:57:11 -04:00
Brad King
9beb4dd8a7 Merge topic 'FindPkgConfig_extra_whitespace' 
d47771bbb9 FindPkgConfig: ignore whitespace separators in version check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8789
 2023-09-12 07:56:11 -04:00
Brad King
d458d08070 Merge branch 'release-3.27' 2023-09-12 07:55:00 -04:00
Brad King
5d1f803a04 Merge topic 'FindBoost-1.83' 
897a149067 FindBoost: Add support for Boost 1.83

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8793
 2023-09-12 07:55:00 -04:00
Brad King
a159c2d3cf Merge topic 'FindBoost-1.83' into release-3.27 
897a149067 FindBoost: Add support for Boost 1.83

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8793
 2023-09-12 07:54:59 -04:00
Brad King
7f1090cd92 Merge branch 'release-3.27' 2023-09-12 07:53:44 -04:00
Brad King
b07ab81faf Merge topic 'FortranCInterface-macos-deployment-target' 
84a097f038 FortranCInterface: forward `CMAKE_OSX_DEPLOYMENT_TARGET`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8790
 2023-09-12 07:53:44 -04:00
Brad King
d2062ecc84 Merge topic 'FortranCInterface-macos-deployment-target' into release-3.27 
84a097f038 FortranCInterface: forward `CMAKE_OSX_DEPLOYMENT_TARGET`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8790
 2023-09-12 07:53:43 -04:00
ChenMoFeiJin
f1a7179520 presets: Add $schema property to JSON schema 
Many modern code editors have support for JSON Schema.  When you specify
the `$schema` property in a JSON file, the editor can provide features
like auto-completion, error checking, etc., which can improve your
efficiency when writing and modifying the `CMakePresets.json` file.
 2023-09-12 18:18:37 +08:00
Kitware Robot
88655936ff CMake Nightly Date Stamp 2023-09-12 00:01:15 -04:00
Kyle Edwards
34d46acfc8 Tests/RunCMake: Set $ENV{PWD} before each test 
This will more accurately emulate how a shell would run CMake.

Also, don't set $ENV{PWD} in Tests/RunCMake/SymlinkTrees, since RunCMake is
now already doing this.
 2023-09-11 16:58:14 -04:00
Robert Maynard
6ebff6ebf8 VS: Avoid unnecessary CUDA device linking for OBJECT libraries 
Without `CudaLink` fields, MSBuild tries to perform a device link step
for object libraries with CUDA_SEPARABLE_COMPILATION on them even when
not needed.  This commonly was encountered when generating PTX or
OPTIX-IR output.
 2023-09-11 16:49:35 -04:00
權少
57a0a16b58 Findosg*: Improve documentation formatting 
Add reST markup for inline literals and cross-references.
 2023-09-11 12:30:05 -04:00
Brad King
a273b7f5d4 Merge topic 'host-msystem-prefix' 
84a25fc263 cmake_host_system_information: Add MSYSTEM_PREFIX query
cdcff0a0f0 cmCMakeHostSystemInformationCommand: Clarify function names and roles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8788
 2023-09-11 12:27:37 -04:00
Brad King
897a149067 FindBoost: Add support for Boost 1.83 
Update the list of known versions.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_83_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.83.0 source tree.

Dependencies differ from 1.82, as mentioned in the 1.83 release notes:

* Boost.Timer no longer depends on Boost.Chrono

Fixes: #25243
 2023-09-11 09:54:49 -04:00
Russell Greene
37d994294b PCH: Add missing dependency of REUSE_FROM shared compiler PDB 
Have the `copy_pdb_idb` script depend on the PCH file so that the shared
compiler PDB is updated when the PCH is rebuilt.

Fixes: #25240
 2023-09-11 08:59:20 -04:00
Orkun Tokdemir
09b650d000 Autogen: Move QtAutoMocDeps tests to RunCMake/Autogen 2023-09-11 14:51:58 +02:00
Orkun Tokdemir
ebc9e448b3 Autogen: Add depfile support for Makefiles 
Fixes: #21677
 2023-09-11 14:51:58 +02:00
Orkun Tokdemir
e5358b9d8d RunCMake: Add RunCMake_TEST_NOT_EXPECT variables 2023-09-11 14:51:58 +02:00
scivision
6ebf0e1a46 Ninja: Use absolute path to COMSPEC if possible 
If the COMSPEC is set to an absolute path, use it instead of just
`cmd.exe`.  This avoids searching for the tool in the current working
directory and the `PATH`.  If COMSPEC is not set to an absolute path,
fall back to the existing behavior.

Issue: #18350
 2023-09-11 08:47:09 -04:00
Brad King
b1cb23a011 Merge topic 'fix-win-dbg-msg' 
cd46ecad19 Debugger: Fix pipe connection error message construction on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8785
 2023-09-11 08:12:29 -04:00
Brad King
4bd020d952 Merge topic 'Fix-FindLua50-and-FindLua51-doc' 
7abb6d14ca FindLua{50,51}: Fix preformatted documentation blocks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8784
 2023-09-11 08:11:40 -04:00
Brad King
3fc4d8b457 Merge topic 'doc-if-number' 
5924a1f0eb Help: Document if() comparison number format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8783
 2023-09-11 08:10:41 -04:00
Kitware Robot
bc41968c8a CMake Nightly Date Stamp 2023-09-11 00:01:45 -04:00
Ben Boeckel
84a097f038 FortranCInterface: forward CMAKE_OSX_DEPLOYMENT_TARGET 
GCC needs to be taught about every macOS release it seems, so older
builds may not support usage on newer releases by default.
 2023-09-10 21:11:34 -04:00
Brad King
84a25fc263 cmake_host_system_information: Add MSYSTEM_PREFIX query 
Add a query on Windows hosts for the installation prefix of a
MSYS or MinGW development environment.

Issue: #24216
 2023-09-10 07:33:47 -04:00
Kitware Robot
d291cc1166 CMake Nightly Date Stamp 2023-09-10 00:01:15 -04:00
scivision
8ea398a7af FindMatlab: Prefer to use VersionInfo.xml to get version, fallback to run 
Parsing the version file is much faster than running Matlab.
It also improves reliability as Matlab silently quits or hangs
in some misconfigured environments.

For old Matlab, falls back to running Matlab.

also refactor file(STRINGS => file(READ as whole file was read anyway

Fixes: #25209
 2023-09-09 22:23:05 -04:00
Paul Zander
d47771bbb9 FindPkgConfig: ignore whitespace separators in version check 
The regex used to split up the version if it contains an operator fails
if the string contains whitespaces. Resulting in an extra whitespace
after the package name and before the package version leading to
breakage in pkgconf and thus webkit-gtk.

See:
https://github.com/pkgconf/pkgconf/issues/317
https://bugs.webkit.org/show_bug.cgi?id=261125
https://bugs.gentoo.org/913644
 2023-09-09 13:49:19 +02:00