[Cmake-commits] [cmake-commits] hoffman committed QMacInstallDialog.cxx 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Apr 3 17:02:28 EDT 2008


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

Modified Files:
	QMacInstallDialog.cxx 
Log Message:
ENH: do not link . and .. during install


Index: QMacInstallDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QMacInstallDialog.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** QMacInstallDialog.cxx	3 Apr 2008 20:18:37 -0000	1.2
--- QMacInstallDialog.cxx	3 Apr 2008 21:02:26 -0000	1.3
***************
*** 41,50 ****
      QFileInfo fileInfo = list.at(i);
      std::string filename = fileInfo.fileName().toStdString();
      std::string file = fileInfo.absoluteFilePath().toStdString();
      std::string newName = installTo;
      newName += "/";
      newName += filename;
-     std::cout << "ln -s [" << file << "] [";
-     std::cout << newName << "]\n";
      // Remove the old files
      if(cmSystemTools::FileExists(newName.c_str()))
--- 41,52 ----
      QFileInfo fileInfo = list.at(i);
      std::string filename = fileInfo.fileName().toStdString();
+     if(filename.size() && filename[0] == '.')
+       {
+       continue;
+       }
      std::string file = fileInfo.absoluteFilePath().toStdString();
      std::string newName = installTo;
      newName += "/";
      newName += filename;
      // Remove the old files
      if(cmSystemTools::FileExists(newName.c_str()))
***************
*** 53,56 ****
--- 55,60 ----
        cmSystemTools::RemoveFile(newName.c_str());
        }
+     std::cout << "ln -s [" << file << "] [";
+     std::cout << newName << "]\n";
      cmSystemTools::CreateSymlink(file.c_str(),
                                   newName.c_str());



More information about the Cmake-commits mailing list