summaryrefslogtreecommitdiffstats
path: root/Source/cmDSPWriter.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-05-15 17:14:13 (GMT)
committerKen Martin <ken.martin@kitware.com>2001-05-15 17:14:13 (GMT)
commita12448c19ba732eaf9b5b2907bf25318f9f97ce8 (patch)
tree6087e4d011217b172671906bcadb248ffe396b36 /Source/cmDSPWriter.cxx
parent60a8a2f6aaef970aada3474909d122dd4e5ade58 (diff)
downloadCMake-a12448c19ba732eaf9b5b2907bf25318f9f97ce8.zip
CMake-a12448c19ba732eaf9b5b2907bf25318f9f97ce8.tar.gz
CMake-a12448c19ba732eaf9b5b2907bf25318f9f97ce8.tar.bz2
added output directory support
Diffstat (limited to 'Source/cmDSPWriter.cxx')
-rw-r--r--Source/cmDSPWriter.cxx16
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx
index 0055276..e3600ef 100644
--- a/Source/cmDSPWriter.cxx
+++ b/Source/cmDSPWriter.cxx
@@ -446,6 +446,18 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
std::string libMultiLineDebugOptions;
std::string libMultiLineOptimizedOptions;
+ // suppoirt override in output directory
+ std::string libPath = "";
+ if (m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"))
+ {
+ libPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH");
+ }
+ std::string exePath = "";
+ if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
+ {
+ exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
+ }
+
std::vector<std::string>::iterator i;
std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories();
for(i = libdirs.begin(); i != libdirs.end(); ++i)
@@ -540,6 +552,10 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
cmSystemTools::ReplaceString(line, "BUILD_INCLUDES",
m_IncludeOptions.c_str());
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName);
+ cmSystemTools::ReplaceString(line, "OUTPUT_LIBRARY_PATH",
+ exePath.c_str());
+ cmSystemTools::ReplaceString(line, "OUTPUT_EXECUTABLE_PATH",
+ exePath.c_str());
cmSystemTools::ReplaceString(line,
"EXTRA_DEFINES",
m_Makefile->GetDefineFlags());