mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-11 12:00:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-multi-segfault' into release-3.19

Browse Source 
f4215ee57d Ninja Multi-Config: Fix segfault when installing an export
18372afcd4 Help: Fix documentation for Ninja Multi-Config's build.ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5355
This commit is contained in:
Kyle Edwards
2020-10-12 18:03:11 +00:00
committed by Kitware Robot
parent 3fb2112880 f4215ee57d
commit 6437343c91
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Help/generator/Ninja Multi-Config.rst
View File

@@ -21,8 +21,7 @@ are intended to be run with ``ninja -f build-<Config>.ninja``. A
``cmake --build . --config <Config>`` will always use ``build-<Config>.ninja``
to build. If no ``--config`` argument is specified, ``cmake --build .`` will
default to ``build-Debug.ninja``, unless a ``build.ninja`` is generated (see
below), in which case that will be used instead.
use ``build.ninja``.
Each ``build-<Config>.ninja`` file contains ``<target>`` targets as well as
``<target>:<Config>`` targets, where ``<Config>`` is the same as the

14
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -2532,14 +2532,14 @@ bool cmGlobalNinjaMultiGenerator::OpenBuildFileStreams()
return false;
}
if (!this->DefaultFileConfig.empty()) {
if (!this->OpenFileStream(this->DefaultFileStream, NINJA_BUILD_FILE)) {
return false;
}
*this->DefaultFileStream
<< "# Build using rules for '" << this->DefaultFileConfig << "'.\n\n"
<< "include " << GetNinjaImplFilename(this->DefaultFileConfig) << "\n\n";
if (!this->OpenFileStream(this->DefaultFileStream, NINJA_BUILD_FILE)) {
return false;
}
*this->DefaultFileStream << "# Build using rules for '"
<< this->DefaultFileConfig << "'.\n\n"
<< "include "
<< GetNinjaImplFilename(this->DefaultFileConfig)
<< "\n\n";
// Write a comment about this file.
*this->CommonFileStream