Browse Source

Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release

Brad King 9 years ago
parent
commit
30dda6724f
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Source/CPack/cmCPackGenerator.cxx

+ 2 - 1
Source/CPack/cmCPackGenerator.cxx

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