mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 01:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
63,148 Commits 2 Branches 401 Tags
e454314daaed0ab5f86bba0015747eb296efb8da
Commit Graph

63148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orkun Tokdemir e454314daa NinjaMultiConfig: Update tests for the new dependency change 2023-09-13 18:23:56 +02:00
Orkun Tokdemir fddd0f0443 Autogen: AUTO*_EXECUTABLE: add support for per-config values 
* Per-config values were added to `AUTO*_EXECUTABLE`.
* Dependency order was refactored for `cmake_autogen` and `cmake_autorcc` to
  avoid unnecessary rebuilds.
* A new parameter was added for `cmake_autogen` and `cmake_autorcc` to specify the config name of the `auto*_executable` to be used.
* The timestamp target was split into three targets for per-config to avoid redundant `mocs_compilation` builds.
* Per-config `DEP_FILE_RULE_NAME` values were added to `AutogenInfo.json` for `CMAKE_CROSS_CONFIG` usage.
* Some functions were refactored to avoid code duplication.

Fixes: #20074
 2023-09-13 18:23:56 +02:00
Orkun Tokdemir 10b09647f2 RunCMake: Add RunCMake_TEST_EXPECT_RESULT 2023-09-13 15:59:57 +02:00
Orkun Tokdemir cac2e029f0 cmQtAutoGenInitializer: Define CrossConfig variable 2023-09-13 15:59:54 +02:00
Orkun Tokdemir d4889361f0 cmQtAutoGenInitializer: Reduce string copies 2023-09-13 15:58:47 +02:00
Orkun Tokdemir 0bf49d5579 cmQtAutoGenInitializer: Remove no-op call 2023-09-13 15:58:47 +02:00
Orkun Tokdemir 94c4c1cb28 cmQtAutoGenInitializer: Improve Const-Correctness 2023-09-13 15:58:47 +02:00
Orkun Tokdemir 6d54c36859 Autogen: Fix typo 2023-09-13 15:58:47 +02:00
Orkun Tokdemir 972cfd1bc3 cmCustomCommandGenerator: Fix GetInternalDepfile on moved instance 
Previously the constructor captured `this` in a lambda used by the
`GetInternalDepfile` method, but the pointer is invalidated when the
instance moves.
 2023-09-13 15:58:47 +02: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
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