diff options
author | Brad King <brad.king@kitware.com> | 2023-09-27 15:21:40 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-27 15:22:05 (GMT) |
commit | 2a12a83037dead14173fcf0219f4669229c67147 (patch) | |
tree | e2a56e2c491ef1b65610b309f81b5a17d329d269 /Help/variable | |
parent | 81d863b60aa40c42f08736abbc3fa6715b553240 (diff) | |
parent | 3b632f32fae72ab70f752dd1e22ced40b7a81537 (diff) | |
download | CMake-2a12a83037dead14173fcf0219f4669229c67147.zip CMake-2a12a83037dead14173fcf0219f4669229c67147.tar.gz CMake-2a12a83037dead14173fcf0219f4669229c67147.tar.bz2 |
Merge topic 'misc-cxxmodule-fixes'
3b632f32fa Tests/CXXModules: forward the default build type
5ab6b09691 Tests/CXXModules: fix multi-config and MSVC details
11b62ef118 Tests/CXXModules: add missing `bmi-only` and compiler id fields
5d9631fbdd Tests/CXXModules: fix key set mismatch error messages
86e7fb72cb Tests/CXXModules: use a less generic name for the config
6b940dc590 Tests/CXXModules: replace the object extension as well
1c9f83c8ec Tests/CXXModules: fix error detection propagation
7a4c02cb38 cmGlobalGenerator: factor out messaging for CMP0037
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !8834
Diffstat (limited to 'Help/variable')
-rw-r--r-- | Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst b/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst index a7e9029..2e7f7c4 100644 --- a/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst +++ b/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst @@ -15,7 +15,8 @@ form. The format of the JSON file looks like: { "directory": "/home/user/development/project", "command": "/usr/bin/c++ ... -c ../foo/foo.cc", - "file": "../foo/foo.cc" + "file": "../foo/foo.cc", + "output": "../foo.dir/foo.cc.o" }, ... @@ -23,7 +24,8 @@ form. The format of the JSON file looks like: { "directory": "/home/user/development/project", "command": "/usr/bin/c++ ... -c ../foo/bar.cc", - "file": "../foo/bar.cc" + "file": "../foo/bar.cc", + "output": "../foo.dir/bar.cc.o" } ] |