summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-12-09 02:10:37 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-12-09 02:10:37 (GMT)
commita946931f91bfffe8ce06a9924beb424cb0233907 (patch)
treeef54a575f780454b166fd9a442f5e186fe128946 /Source
parent14e25b614dd40ac66805c10f9a6b8adf33ba4348 (diff)
downloadCMake-a946931f91bfffe8ce06a9924beb424cb0233907.zip
CMake-a946931f91bfffe8ce06a9924beb424cb0233907.tar.gz
CMake-a946931f91bfffe8ce06a9924beb424cb0233907.tar.bz2
BUG: if LIBRARY_OUTPUT_PATH is set, then use the fullpath for a remote target
Diffstat (limited to 'Source')
-rw-r--r--Source/cmUnixMakefileGenerator.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index 8e1a2f1..1a1c48f 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -869,9 +869,14 @@ void cmUnixMakefileGenerator::OutputBuildLibraryInDir(std::ostream& fout,
const char* library,
const char* fullpath)
{
+ const char* makeTarget = library;
+ if(m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"))
+ {
+ makeTarget = fullpath;
+ }
fout << cmSystemTools::EscapeSpaces(fullpath)
<< ":\n\tcd " << cmSystemTools::EscapeSpaces(path)
- << "; $(MAKE) " << library << "\n\n";
+ << "; $(MAKE) " << makeTarget << "\n\n";
}
bool cmUnixMakefileGenerator::SamePath(const char* path1, const char* path2)