diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-14 14:34:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-14 14:34:28 (GMT) |
| commit | ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5 (patch) | |
| tree | eba3402f6bb226d92b2d1d3cfeaaa6e13aaa6c2d /Source/cmNinjaTargetGenerator.cxx | |
| parent | 1b05417e3c04bccd38c9e0c6b4819508dcb25ccf (diff) | |
| parent | c736de7b284ecc93bac48106e88417e0e6c92ad6 (diff) | |
| download | CMake-ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5.zip CMake-ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5.tar.gz CMake-ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5.tar.bz2 | |
Merge topic 'refactor-rule-var-includes'
c736de7b Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables
6f94b03c Place <DEFINES> before <FLAGS> consistently across compilers
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 43b9139..74f262c 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -321,6 +321,7 @@ cmNinjaTargetGenerator vars.Source = "$in"; vars.Object = "$out"; vars.Defines = "$DEFINES"; + vars.Includes = "$INCLUDES"; vars.TargetPDB = "$TARGET_PDB"; vars.TargetCompilePDB = "$TARGET_COMPILE_PDB"; vars.ObjectDir = "$OBJECT_DIR"; @@ -598,6 +599,7 @@ cmNinjaTargetGenerator cmNinjaVars vars; vars["FLAGS"] = this->ComputeFlagsForObject(source, language); vars["DEFINES"] = this->ComputeDefines(source, language); + vars["INCLUDES"] = this->GetIncludes(language); if (!this->NeedDepTypeMSVC(language)) { vars["DEP_FILE"] = cmGlobalNinjaGenerator::EncodeDepfileSpace(objectFileName + ".d"); @@ -643,6 +645,7 @@ cmNinjaTargetGenerator compileObjectVars.ObjectFileDir = objectFileDir.c_str(); compileObjectVars.Flags = vars["FLAGS"].c_str(); compileObjectVars.Defines = vars["DEFINES"].c_str(); + compileObjectVars.Includes = vars["INCLUDES"].c_str(); // Rule for compiling object file. std::string compileCmdVar = "CMAKE_"; |