[cmake-commits] hoffman committed cmGlobalXCodeGenerator.cxx 1.174
1.175 cmInstallTargetGenerator.cxx 1.49 1.50
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 10 15:17:26 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv16288/Source
Modified Files:
cmGlobalXCodeGenerator.cxx cmInstallTargetGenerator.cxx
Log Message:
BUG: fix for bug 6193, fix xcode depend helper
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- cmGlobalXCodeGenerator.cxx 23 Dec 2007 18:16:21 -0000 1.174
+++ cmGlobalXCodeGenerator.cxx 10 Jan 2008 20:17:23 -0000 1.175
@@ -294,11 +294,6 @@
}
cmCustomCommandLines commandLines;
commandLines.push_back(makecommand);
- mf->AddUtilityCommand("XCODE_DEPEND_HELPER", true,
- no_working_directory,
- no_depends,
- commandLines);
-
// Add Re-Run CMake rules
this->CreateReRunCMakeFile(root);
@@ -316,13 +311,22 @@
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
{
cmTarget& target = l->second;
- // make all exe, shared libs and modules depend
- // on the XCODE_DEPEND_HELPER target
+ // make all exe, shared libs and modules
+ // run the depend check makefile as a post build rule
+ // this will make sure that when the next target is built
+ // things are up-to-date
if((target.GetType() == cmTarget::EXECUTABLE ||
+ target.GetType() == cmTarget::STATIC_LIBRARY ||
target.GetType() == cmTarget::SHARED_LIBRARY ||
target.GetType() == cmTarget::MODULE_LIBRARY))
{
- target.AddUtility("XCODE_DEPEND_HELPER");
+ lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(),
+ no_depends,
+ commandLines,
+ cmTarget::POST_BUILD,
+ "Depend check for xcode",
+ dir.c_str());
+
}
if(!target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
@@ -2849,6 +2853,7 @@
newDir += "/";
newDir += config;
dir = newDir;
+ dir += framework;
}
else
{
Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- cmInstallTargetGenerator.cxx 19 Dec 2007 08:56:13 -0000 1.49
+++ cmInstallTargetGenerator.cxx 10 Jan 2008 20:17:23 -0000 1.50
@@ -238,18 +238,9 @@
{
// Compute the build tree location of the framework directory
std::string from1 = fromDirConfig;
- if(config && *config)
- {
- from1 += "/";
- from1 += targetName;
- from1 += ".framework";
- }
- else
- {
- // Remove trailing slashes... so that from1 ends with ".framework":
- //
- cmSystemTools::ConvertToUnixSlashes(from1);
- }
+ // Remove trailing slashes... so that from1 ends with ".framework":
+ //
+ cmSystemTools::ConvertToUnixSlashes(from1);
files.push_back(from1);
type = cmTarget::INSTALL_DIRECTORY;
More information about the Cmake-commits
mailing list