--- ExeProj.cmake.xcodeproj/project.pbxproj	2013-06-02 12:09:23.000000000 +0200
+++ ExeProj.xcodeproj/project.pbxproj	2013-06-02 12:19:45.000000000 +0200
@@ -35,6 +35,9 @@
 
 /* Begin PBXBuildFile section */
 		4BDCB1E2158D4B8E9BF37819 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 721586BF3DE84817B7416AEA /* main.cpp */; settings = {COMPILER_FLAGS = ""; }; };
+		5A5E0616175B519400492517 /* libLibA.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A5E0615175B519400492517 /* libLibA.a */; };
+		5A5E0618175B519A00492517 /* libLibB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A5E0617175B519A00492517 /* libLibB.a */; };
+		5A5E061A175B519E00492517 /* libLibC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A5E0619175B519E00492517 /* libLibC.a */; };
 		C3994EE780344673A527E134 /* fit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B56C0048BD774F4E93AE6F58 /* fit.cpp */; settings = {COMPILER_FLAGS = ""; }; };
 /* End PBXBuildFile section */
 
@@ -65,10 +68,26 @@
 /* Begin PBXFileReference section */
 		18A208A34A6948FF9593A5C7 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.text; path = CMakeLists.txt; sourceTree = SOURCE_ROOT; };
 		19859DD71BF7410DB649D752 /* ExeProj */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; path = ExeProj; sourceTree = BUILT_PRODUCTS_DIR; };
+		5A5E0615175B519400492517 /* libLibA.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLibA.a; path = ../LibProj/build/LibA/Debug/libLibA.a; sourceTree = "<group>"; };
+		5A5E0617175B519A00492517 /* libLibB.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLibB.a; path = ../LibProj/build/LibB/Debug/libLibB.a; sourceTree = "<group>"; };
+		5A5E0619175B519E00492517 /* libLibC.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLibC.a; path = ../LibProj/build/LibC/Debug/libLibC.a; sourceTree = "<group>"; };
 		721586BF3DE84817B7416AEA /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = SOURCE_ROOT; };
 		B56C0048BD774F4E93AE6F58 /* fit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fit.cpp; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
+/* Begin PBXFrameworksBuildPhase section */
+		5A5E0614175B518B00492517 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5A5E061A175B519E00492517 /* libLibC.a in Frameworks */,
+				5A5E0618175B519A00492517 /* libLibB.a in Frameworks */,
+				5A5E0616175B519400492517 /* libLibA.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
 /* Begin PBXGroup section */
 		19F9CC3CC5E74AC4B0FA61B6 /* Resources */ = {
 			isa = PBXGroup;
@@ -84,6 +103,16 @@
 			name = "CMake Rules";
 			sourceTree = "<group>";
 		};
+		5A5E061B175B51A900492517 /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				5A5E0619175B519E00492517 /* libLibC.a */,
+				5A5E0617175B519A00492517 /* libLibB.a */,
+				5A5E0615175B519400492517 /* libLibA.a */,
+			);
+			name = Libraries;
+			sourceTree = "<group>";
+		};
 		5B4C591D0CA04836893D3EAD /* Sources */ = {
 			isa = PBXGroup;
 			children = (
@@ -106,6 +135,7 @@
 		7554FAFE26D44CD48C9F962F = {
 			isa = PBXGroup;
 			children = (
+				5A5E061B175B51A900492517 /* Libraries */,
 				5B4C591D0CA04836893D3EAD /* Sources */,
 				19F9CC3CC5E74AC4B0FA61B6 /* Resources */,
 				A4B215E29F9D44F9B175B1BC /* Products */,
@@ -162,6 +192,7 @@
 			buildConfigurationList = 4D881F68A9F248BE81AEE55D /* Build configuration list for PBXNativeTarget "ExeProj" */;
 			buildPhases = (
 				2002C6136A4D45A9AD2C6171 /* Sources */,
+				5A5E0614175B518B00492517 /* Frameworks */,
 				2F18AF792ED5451C91E32C72 /* CMake PostBuild Rules */,
 			);
 			buildRules = (
@@ -289,7 +320,12 @@
 					/usr/local/include,
 				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../LibProj/build/LibA/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibB/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibC/Debug\"",
+				);
 				OTHER_CFLAGS = (
 				);
 				OTHER_CPLUSPLUSFLAGS = (
@@ -297,9 +333,6 @@
 				OTHER_LDFLAGS = (
 					"-Wl,-search_paths_first",
 					"-Wl,-headerpad_max_install_names",
-					"/path/to/LibProj/build/LibA/Debug/libLibA.a",
-					"/path/to/LibProj/build/LibB/Debug/libLibB.a",
-					"/path/to/LibProj/build/LibC/Debug/libLibC.a",
 					/usr/local/lib/libSysLibA.a,
 					/usr/local/lib/libSysLibB.a,
 					/usr/local/lib/libSysLibC.a,
@@ -339,7 +372,12 @@
 					/usr/local/include,
 				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../LibProj/build/LibA/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibB/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibC/Debug\"",
+				);
 				OTHER_CFLAGS = (
 					"-DNDEBUG",
 				);
@@ -349,9 +387,6 @@
 				OTHER_LDFLAGS = (
 					"-Wl,-search_paths_first",
 					"-Wl,-headerpad_max_install_names",
-					"/path/to/LibProj/build/LibA/MinSizeRel/libLibA.a",
-					"/path/to/LibProj/build/LibB/MinSizeRel/libLibB.a",
-					"/path/to/LibProj/build/LibC/MinSizeRel/libLibC.a",
 					/usr/local/lib/libSysLibA.a,
 					/usr/local/lib/libSysLibB.a,
 					/usr/local/lib/libSysLibC.a,
@@ -476,7 +511,12 @@
 					/usr/local/include,
 				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../LibProj/build/LibA/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibB/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibC/Debug\"",
+				);
 				OTHER_CFLAGS = (
 					"-DNDEBUG",
 				);
@@ -486,9 +526,6 @@
 				OTHER_LDFLAGS = (
 					"-Wl,-search_paths_first",
 					"-Wl,-headerpad_max_install_names",
-					"/path/to/LibProj/build/LibA/RelWithDebInfo/libLibA.a",
-					"/path/to/LibProj/build/LibB/RelWithDebInfo/libLibB.a",
-					"/path/to/LibProj/build/LibC/RelWithDebInfo/libLibC.a",
 					/usr/local/lib/libSysLibA.a,
 					/usr/local/lib/libSysLibB.a,
 					/usr/local/lib/libSysLibC.a,
@@ -747,7 +784,12 @@
 					/usr/local/include,
 				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../LibProj/build/LibA/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibB/Debug\"",
+					"\"$(SRCROOT)/../LibProj/build/LibC/Debug\"",
+				);
 				OTHER_CFLAGS = (
 					"-DNDEBUG",
 				);
@@ -757,9 +799,6 @@
 				OTHER_LDFLAGS = (
 					"-Wl,-search_paths_first",
 					"-Wl,-headerpad_max_install_names",
-					"/path/to/LibProj/build/LibA/Release/libLibA.a",
-					"/path/to/LibProj/build/LibB/Release/libLibB.a",
-					"/path/to/LibProj/build/LibC/Release/libLibC.a",
 					/usr/local/lib/libSysLibA.a,
 					/usr/local/lib/libSysLibB.a,
 					/usr/local/lib/libSysLibC.a,

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bb1e792..45618f5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2681,6 +2681,131 @@ void cmGlobalXCodeGenerator
     return;
     }
 
+  // Collect libraries to add to "Link Binary With Libraries" build phase
+  std::set<std::string> buildLibs;
+  cmXCodeObject* buildFiles = 0;
+  cmXCodeObject* buildGroup = 0;
+  if(this->XcodeVersion >= 40)
+    {
+    for(std::vector<std::string>::iterator i =
+        this->CurrentConfigurationTypes.begin();
+        i != this->CurrentConfigurationTypes.end(); ++i)
+      {
+      // Get the current configuration name.
+      const char* configName = i->c_str();
+      if(!*configName)
+        {
+        configName = 0;
+        }
+
+      // Compute the link library and directory information.
+      cmComputeLinkInformation* pcli = cmtarget->GetLinkInformation(configName);
+      if(!pcli)
+        {
+        buildLibs.clear();
+        break;
+        }
+      cmComputeLinkInformation& cli = *pcli;
+
+      // get the set of libraries for this configuration
+      std::set<std::string> myLibs;
+      typedef cmComputeLinkInformation::ItemVector ItemVector;
+      ItemVector const& libNames = cli.GetItems();
+      for(ItemVector::const_iterator li = libNames.begin();
+          li != libNames.end(); ++li)
+        {
+        if(li->IsPath)
+          {
+#if defined(_WIN32)
+          std::string::size_type slash_pos = li->Value.find_last_of("/\\");
+#else
+          std::string::size_type slash_pos = li->Value.find_last_of("/");
+#endif
+          std::string file = li->Value.substr(slash_pos + 1);
+          std::set<std::string>::iterator set_pos = myLibs.find(file);
+          if(set_pos == myLibs.end())
+            {
+            myLibs.insert(file);
+            }
+          else
+            {
+            myLibs.erase(set_pos);
+            }
+          }
+        }
+
+      // find libraries that are present in all configurations (intersection)
+      if(buildLibs.empty())
+        {
+        buildLibs = myLibs;
+        }
+      else
+        {
+        std::set<std::string>::iterator li = buildLibs.begin();
+        std::set<std::string>::iterator lj = myLibs.begin();
+        while((li != buildLibs.end()) && (lj != myLibs.end()))
+          {
+          if(*li < *lj)
+            {
+            buildLibs.erase(li++);
+            }
+          else if(*li > *lj)
+            {
+            ++lj;
+            }
+          else
+            {
+            ++li;
+            ++lj;
+            }
+          }
+        buildLibs.erase(li, buildLibs.end());
+        if(buildLibs.empty())
+          {
+          break;
+          }
+        }
+      }
+
+    // Get or create the build phase
+    cmXCodeObject* frameworkBuildPhase = 0;
+    if(!buildLibs.empty())
+      {
+      cmXCodeObject* buildPhases = target->GetObject("buildPhases");
+      frameworkBuildPhase =
+        buildPhases->GetObject(cmXCodeObject::PBXFrameworksBuildPhase);
+      if(frameworkBuildPhase)
+        {
+        buildFiles = frameworkBuildPhase->GetObject("files");
+        }
+      else
+        {
+        frameworkBuildPhase =
+          this->CreateObject(cmXCodeObject::PBXFrameworksBuildPhase);
+        frameworkBuildPhase->SetComment("Frameworks");
+        frameworkBuildPhase->AddAttribute("buildActionMask",
+                                          this->CreateString("2147483647"));
+        buildFiles = this->CreateObject(cmXCodeObject::OBJECT_LIST);
+        frameworkBuildPhase->AddAttribute("files", buildFiles);
+        frameworkBuildPhase->AddAttribute("runOnlyForDeploymentPostprocessing",
+                                          this->CreateString("0"));
+        buildPhases->AddObject(frameworkBuildPhase);
+        }
+      }
+
+    // Create the group for libraries
+    if(!buildLibs.empty())
+      {
+      buildGroup = this->CreateObject(cmXCodeObject::OBJECT_LIST);
+      cmXCodeObject* librariesGroup =
+        this->CreateObject(cmXCodeObject::PBXGroup);
+      librariesGroup->AddAttribute("name", this->CreateString("Libraries"));
+      librariesGroup->AddAttribute("children", buildGroup);
+      librariesGroup->AddAttribute("sourceTree", this->CreateString("<group>"));
+      this->MainGroupChildren->AddObject(librariesGroup);
+      }
+    }
+
   // Loop over configuration types and set per-configuration info.
   for(std::vector<std::string>::iterator i =
         this->CurrentConfigurationTypes.begin();
@@ -2739,21 +2864,63 @@ void cmGlobalXCodeGenerator
     // now add the link libraries
     {
     std::string linkLibs;
-    const char* sep = "";
+    std::string linkDirs;
+    std::set<std::string> libPaths;
     typedef cmComputeLinkInformation::ItemVector ItemVector;
     ItemVector const& libNames = cli.GetItems();
     for(ItemVector::const_iterator li = libNames.begin();
         li != libNames.end(); ++li)
       {
-      linkLibs += sep;
-      sep = " ";
       if(li->IsPath)
         {
-        linkLibs += this->XCodeEscapePath(li->Value.c_str());
+        if(this->XcodeVersion < 40)
+          {
+          linkLibs += " " + this->XCodeEscapePath(li->Value.c_str());
+          }
+        else
+          {
+#if defined(_WIN32)
+          std::string::size_type slash_pos = li->Value.find_last_of("/\\");
+#else
+          std::string::size_type slash_pos = li->Value.find_last_of("/");
+#endif
+          std::string file = li->Value.substr(slash_pos + 1);
+          std::string path = li->Value.substr(0, slash_pos);
+          if(buildLibs.find(file) != buildLibs.end())
+            {
+            libPaths.insert(path);
+            if(i == this->CurrentConfigurationTypes.begin())
+              {
+                std::string relpath = this->RelativeToSource(li->Value.c_str());
+
+                cmXCodeObject* fileRef = this->CreateObject(cmXCodeObject::PBXFileReference);
+
+                fileRef->SetComment(file.c_str());
+
+                fileRef->AddAttribute("lastKnownFileType", this->CreateString("archive.ar"));
+                fileRef->AddAttribute("name", this->CreateString(file.c_str()));
+                fileRef->AddAttribute("path", this->CreateString(relpath.c_str()));
+                fileRef->AddAttribute("sourceTree", this->CreateString("<group>"));
+
+                cmXCodeObject* buildFile = this->CreateObject(cmXCodeObject::PBXBuildFile);
+
+                std::string comment = file + " in Frameworks";
+                buildFile->SetComment(comment.c_str());
+                buildFile->AddAttribute("fileRef", this->CreateObjectReference(fileRef));
+
+                buildFiles->AddObject(buildFile);
+                buildGroup->AddObject(fileRef);
+              }
+            }
+          else
+            {
+            linkLibs += " " + this->XCodeEscapePath(li->Value.c_str());
+            }
+          }
         }
       else
         {
-        linkLibs += li->Value;
+        linkLibs += " " + li->Value;
         }
       if(li->Target && !li->Target->IsImported())
         {
@@ -2762,6 +2929,13 @@ void cmGlobalXCodeGenerator
       }
     this->AppendBuildSettingAttribute(target, "OTHER_LDFLAGS",
                                       linkLibs.c_str(), configName);
+    for(std::set<std::string>::const_iterator li = libPaths.begin();
+        li != libPaths.end(); ++li)
+      {
+      linkDirs += " " + this->XCodeEscapePath(li->c_str());
+      }
+    this->AppendBuildSettingAttribute(target, "LIBRARY_SEARCH_PATHS",
+                                      linkDirs.c_str(), configName);
     }
     }
 }