Просмотр исходного кода

BUG: When MACOSX_PACKAGE_LOCATION specifies Headers/foo we must still create the Headers symlink.

Brad King 17 лет назад
Родитель
Сommit
238d9d9e30
1 измененных файлов с 7 добавлено и 2 удалено
  1. 7 2
      Source/cmMakefileTargetGenerator.cxx

+ 7 - 2
Source/cmMakefileTargetGenerator.cxx

@@ -334,8 +334,13 @@ void cmMakefileTargetGenerator::WriteMacOSXContentRules(cmSourceFile& source,
   macdir += pkgloc;
   cmSystemTools::MakeDirectory(macdir.c_str());
 
-  // Record use of this content location.
-  this->MacContentFolders.insert(pkgloc);
+  // Record use of this content location.  Only the first level
+  // directory is needed.
+  {
+  std::string loc = pkgloc;
+  loc = loc.substr(0, loc.find('/'));
+  this->MacContentFolders.insert(loc);
+  }
 
   // Get the input file location.
   std::string input = source.GetFullPath();