[cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx
1.217 1.218
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 26 10:01:51 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17661
Modified Files:
cmLocalUnixMakefileGenerator3.cxx
Log Message:
BUG: Fixed computation of 'object' name for MACOSX_PACKAGE_LOCATION source files.
Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- cmLocalUnixMakefileGenerator3.cxx 12 Oct 2007 13:32:48 -0000 1.217
+++ cmLocalUnixMakefileGenerator3.cxx 26 Nov 2007 15:01:49 -0000 1.218
@@ -1724,8 +1724,8 @@
}
obj += fileTargetDirectory;
- obj = cmSystemTools::RelativePath
- (this->Makefile->GetHomeOutputDirectory(), obj.c_str());
+ // Object names are specified relative to the current build dir.
+ obj = this->Convert(obj.c_str(), START_OUTPUT);
obj += "/";
obj += objectName;
return obj;
More information about the Cmake-commits
mailing list