Quellcode durchsuchen

Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'

57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
Brad King vor 9 Jahren
Ursprung
Commit
6a98785d8f
1 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen
  1. 2 1
      Source/CPack/cmCPackGenerator.cxx

+ 2 - 1
Source/CPack/cmCPackGenerator.cxx

@@ -626,7 +626,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
         cmGlobalGenerator gg(&cm);
         cmGlobalGenerator gg(&cm);
         CM_AUTO_PTR<cmMakefile> mf(
         CM_AUTO_PTR<cmMakefile> mf(
           new cmMakefile(&gg, cm.GetCurrentSnapshot()));
           new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-        if (!installSubDirectory.empty() && installSubDirectory != "/") {
+        if (!installSubDirectory.empty() && installSubDirectory != "/" &&
+            installSubDirectory != ".") {
           tempInstallDirectory += installSubDirectory;
           tempInstallDirectory += installSubDirectory;
         }
         }
         if (componentInstall) {
         if (componentInstall) {