[cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx 1.198 1.199

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Mar 8 14:15:47 EST 2007


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

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
ENH: Ask the target for its own directory in case of bundle instead of directly using ExecutableOutputPath.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- cmLocalUnixMakefileGenerator3.cxx	8 Mar 2007 18:19:39 -0000	1.198
+++ cmLocalUnixMakefileGenerator3.cxx	8 Mar 2007 19:15:45 -0000	1.199
@@ -1679,12 +1679,8 @@
     if ( target.GetPropertyAsBool("MACOSX_BUNDLE") )
       {
       // Construct the full path version of the names.
-      obj = this->ExecutableOutputPath;
-      if(obj.empty())
-        {
-        obj = this->Makefile->GetStartOutputDirectory();
-        obj += "/";
-        }
+      obj = target.GetDirectory();
+      obj += "/";
       obj += targetName + ".app/Contents/";
       obj += fileTargetDirectory;
       }



More information about the Cmake-commits mailing list