reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-01 17:42:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'ninja-windows-POST_BUILD-noop'

Browse Source 
353f6362 Ninja: Fix POST_BUILD noop on Windows
This commit is contained in:
Brad King 2016-11-01 09:14:12 -04:00 committed by CMake Topic Stage
commit e27716bd42
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGlobalNinjaGenerator.cxx
View File

@ -34,6 +34,11 @@
const char* cmGlobalNinjaGenerator::NINJA_BUILD_FILE = "build.ninja";
const char* cmGlobalNinjaGenerator::NINJA_RULES_FILE = "rules.ninja";
const char* cmGlobalNinjaGenerator::INDENT = " ";
#ifdef _WIN32
std::string const cmGlobalNinjaGenerator::SHELL_NOOP = "cd .";
#else
std::string const cmGlobalNinjaGenerator::SHELL_NOOP = ":";
#endif
void cmGlobalNinjaGenerator::Indent(std::ostream& os, int count)
{

3
Source/cmGlobalNinjaGenerator.h
View File

@ -58,6 +58,9 @@ public:
/// The indentation string used when generating Ninja's build file.
static const char* INDENT;
/// The shell command used for a no-op.
static std::string const SHELL_NOOP;
/// Write @a count times INDENT level to output stream @a os.
static void Indent(std::ostream& os, int count);

8
Source/cmLocalNinjaGenerator.cxx
View File

@ -299,15 +299,11 @@ void cmLocalNinjaGenerator::AppendCustomCommandDeps(
std::string cmLocalNinjaGenerator::BuildCommandLine(
const std::vector<std::string>& cmdLines)
{
// If we have no commands but we need to build a command anyway, use ":".
// If we have no commands but we need to build a command anyway, use noop.
// This happens when building a POST_BUILD value for link targets that
// don't use POST_BUILD.
if (cmdLines.empty()) {
#ifdef _WIN32
return "cd .";
#else
return ":";
#endif
return cmGlobalNinjaGenerator::SHELL_NOOP;
}
std::ostringstream cmd;

2
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -675,7 +675,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
if (!symlinkNeeded) {
vars["POST_BUILD"] = postBuildCmdLine;
} else {
vars["POST_BUILD"] = ":";
vars["POST_BUILD"] = cmGlobalNinjaGenerator::SHELL_NOOP;
symlinkVars["POST_BUILD"] = postBuildCmdLine;
}
cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator();