From ded244d1a86ae17efee4dd3605efd1c10f6f3cd5 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Tue, 24 Aug 2004 11:30:33 -0400 Subject: [PATCH] ERR: Fix the list of targets. The base target name now includes the MACOSX_BUNDLE path --- Source/cmLocalUnixMakefileGenerator.cxx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index d8661518d..63de2720a 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -337,6 +337,15 @@ std::string cmLocalUnixMakefileGenerator::GetOutputExtension(const char* s) std::string cmLocalUnixMakefileGenerator::GetBaseTargetName(const char* n, const cmTarget& t) { + std::string pathPrefix = ""; +#ifdef __APPLE__ + if ( t.GetPropertyAsBool("MACOSX_BUNDLE") ) + { + pathPrefix = n; + pathPrefix += ".app/Contents/MacOS/"; + } +#endif + const char* targetPrefix = t.GetProperty("PREFIX"); const char* prefixVar = 0; switch(t.GetType()) @@ -361,7 +370,7 @@ std::string cmLocalUnixMakefileGenerator::GetBaseTargetName(const char* n, { targetPrefix = m_Makefile->GetSafeDefinition(prefixVar); } - std::string name = targetPrefix?targetPrefix:""; + std::string name = pathPrefix + (targetPrefix?targetPrefix:""); name += n; return name; }