diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 22:29:47 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 16:39:59 (GMT) |
| commit | ce75c86ec30e736a738a4143d4abad73117e06c6 (patch) | |
| tree | 6abb1bb3bc07a63021f096670c1e2b34d93f04af /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | 526cc7dc52673f1eeb1055ce381e0551f763daea (diff) | |
| download | CMake-ce75c86ec30e736a738a4143d4abad73117e06c6.zip CMake-ce75c86ec30e736a738a4143d4abad73117e06c6.tar.gz CMake-ce75c86ec30e736a738a4143d4abad73117e06c6.tar.bz2 | |
cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 874a120..c64fe50 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -492,9 +492,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() { if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS")) { - std::string dllname = targetOutput; std::string name_of_def_file - = target.GetSupportDirectory(); + = gt.GetSupportDirectory(); name_of_def_file += "/" + target.GetName(); name_of_def_file += ".def "; vars["LINK_FLAGS"] += " /DEF:"; @@ -582,7 +581,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() vars["TARGET_PDB"] = base + suffix + dbg_suffix; } - const std::string objPath = GetTarget()->GetSupportDirectory(); + const std::string objPath = GetGeneratorTarget()->GetSupportDirectory(); vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat( this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL); @@ -634,7 +633,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() this->GetLocalGenerator()->ConvertToOutputFormat( cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL); std::string name_of_def_file - = target.GetSupportDirectory(); + = gt.GetSupportDirectory(); name_of_def_file += "/" + target.GetName(); name_of_def_file += ".def"; std::string cmd = cmakeCommand; |