[Cmake-commits] [cmake-commits] hoffman committed cmFileCommand.cxx 1.103 1.104 cmake.cxx 1.381 1.382

[cmake-commits at cmake.org]

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

Modified Files:
	cmFileCommand.cxx cmake.cxx 
Log Message:
ENH: install the mac application bundle into /Applications directly with no enclosing folder


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.381
retrieving revision 1.382
diff -C 2 -d -r1.381 -r1.382
*** cmake.cxx	2 Apr 2008 21:29:25 -0000	1.381
--- cmake.cxx	4 Apr 2008 20:02:50 -0000	1.382
***************
*** 787,790 ****
--- 787,803 ----
    cMakeSelf += "/cmake";
    cMakeSelf += cmSystemTools::GetExecutableExtension();
+ #if __APPLE__
+   // on the apple this might be the gui bundle
+   if(!cmSystemTools::FileExists(cMakeSelf.c_str()))
+     {
+     cMakeSelf = cmSystemTools::GetExecutableDirectory();
+     cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
+     cMakeSelf += "../../../..";
+     cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
+     cMakeSelf = cmSystemTools::CollapseFullPath(cMakeSelf.c_str());
+     cMakeSelf += "/cmake";
+     std::cerr << cMakeSelf.c_str() << "\n";
+     }
+ #endif 
    if(!cmSystemTools::FileExists(cMakeSelf.c_str()))
      {

Index: cmFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v
retrieving revision 1.103
retrieving revision 1.104
diff -C 2 -d -r1.103 -r1.104
*** cmFileCommand.cxx	13 Mar 2008 13:28:26 -0000	1.103
--- cmFileCommand.cxx	4 Apr 2008 20:02:50 -0000	1.104
***************
*** 1245,1249 ****
                                               std::string& destination)
  {
!   if ( destination.size() < 2 )
      {
      this->SetError("called with inapropriate arguments. "
--- 1245,1250 ----
                                               std::string& destination)
  {
!   // allow for / to be a valid destination
!   if ( destination.size() < 2 && destination != "/" )
      {
      this->SetError("called with inapropriate arguments. "