diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-21 13:42:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-21 13:42:07 (GMT) |
| commit | 5a5ef00106662da5c6400d76438289f505b4a1ff (patch) | |
| tree | fc3dcb6d19a8d1d9bc28a1f60338551c3a4e510c /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 81c01d4a3461cf645ff3db794cf6217318f268d3 (diff) | |
| parent | 8dc3a67c9c3c5b49fe7a3b69dab7d60475414c59 (diff) | |
| download | CMake-5a5ef00106662da5c6400d76438289f505b4a1ff.zip CMake-5a5ef00106662da5c6400d76438289f505b4a1ff.tar.gz CMake-5a5ef00106662da5c6400d76438289f505b4a1ff.tar.bz2 | |
Merge topic 'clean-up-cmMakefile'
8dc3a67c cmMakefile: Out-of-line the directory methods.
0f3c8cfa cmMakefile: Use method abstraction to access directories.
b288a997 cmMakefile: Rename SetStart* directory API to SetCurrent*.
932d53bc cmMakefile: Remove redundant method duplication.
32b8f03a cmMakefile: Port users of GetStart* methods to new names.
54d6a918 cmMakefile: Rename GetCurrent{Output,Binary}Directory.
55d80d0a cmMakefile: Rename GetCurrent{,Source}Directory.
b23cf06f cmake: Remove redundant start directories.
fcf246ac cmMakefile: Populate Home directories on initialize.
8878bea7 cmake: Initialize Home directories on cmake for find-package mode.
044dc815 Use the Home directories from the cmake class where intended.
d67e8f24 cmake: Fix directory used to find the cache
1ea085d1 cmMakefile: Initialize dir definitions early.
f034bb2f Remove redundant calls to MakeStartDirectoriesCurrent.
3a68c323 cmMakefile: Fix wrong parameter names.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 79a7914..76f2e14 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -679,7 +679,7 @@ void cmGlobalNinjaGenerator // Compute full path to object file directory for this target. std::string dir; - dir += gt->Makefile->GetCurrentOutputDirectory(); + dir += gt->Makefile->GetCurrentBinaryDirectory(); dir += "/"; dir += gt->LocalGenerator->GetTargetDirectory(*target); dir += "/"; @@ -886,7 +886,7 @@ cmGlobalNinjaGenerator case cmTarget::OBJECT_LIBRARY: case cmTarget::UTILITY: { std::string path = ng->ConvertToNinjaPath( - target->GetMakefile()->GetStartOutputDirectory()); + target->GetMakefile()->GetCurrentBinaryDirectory()); if (path.empty() || path == ".") outputs.push_back(target->GetName()); else { |