[Cmake-commits] [cmake-commits] hoffman committed cmMakefileLibraryTargetGenerator.cxx 1.60 1.61 cmMakefileTargetGenerator.cxx 1.95 1.96

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv32137

Modified Files:
	cmMakefileLibraryTargetGenerator.cxx 
	cmMakefileTargetGenerator.cxx 
Log Message:
BUG: make sure OBJECT_DIR is in the path of the SHELL


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.60
retrieving revision 1.61
diff -C 2 -d -r1.60 -r1.61
*** cmMakefileLibraryTargetGenerator.cxx	8 Apr 2008 04:06:46 -0000	1.60
--- cmMakefileLibraryTargetGenerator.cxx	11 Apr 2008 17:13:15 -0000	1.61
***************
*** 725,729 ****
    objdir += this->Target->GetName();
    objdir += ".dir";
!   vars.ObjectDir = objdir.c_str(); 
    vars.Target = targetOutPathReal.c_str();
    std::string linkString = linklibs.str();
--- 725,732 ----
    objdir += this->Target->GetName();
    objdir += ".dir";
!   objdir = this->Convert(objdir.c_str(),
!                          cmLocalGenerator::START_OUTPUT,
!                          cmLocalGenerator::SHELL);
!   vars.ObjectDir = objdir.c_str();
    vars.Target = targetOutPathReal.c_str();
    std::string linkString = linklibs.str();

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.95
retrieving revision 1.96
diff -C 2 -d -r1.95 -r1.96
*** cmMakefileTargetGenerator.cxx	8 Apr 2008 04:06:46 -0000	1.95
--- cmMakefileTargetGenerator.cxx	11 Apr 2008 17:13:15 -0000	1.96
***************
*** 615,618 ****
--- 615,621 ----
    vars.Object = shellObj.c_str();
    std::string objectDir = cmSystemTools::GetFilenamePath(obj);
+   objectDir = this->Convert(objectDir.c_str(),
+                             cmLocalGenerator::START_OUTPUT,
+                             cmLocalGenerator::SHELL);
    vars.ObjectDir = objectDir.c_str();
    vars.Flags = flags.c_str();