[cmake-developers] Bugfix for CPack / CPACK_INSTALL_CMAKE_PROJECTS

[Daniel Wirtz]

hey,

unfortunately i wont have the time to go dig in and provide a test for 
that .. my work on this project literally ends
in one week. we've got our own fork of cmake 
(https://github.com/OpenCMISS-Dependencies/CMake) that contains fix.

here's a patch (based on current master 
ed1b3430fcfc906780b68fe4a073590c6d23ff08) that at least gets this going.
i believe if no one yet complained about the missing feature, it may as 
well stay as "unsupported" as its been before - at least then the
current project group would not have to maintain an extra CMake fork and 
build process just for those two lines :-)

-----------------------------------------------------------------------

 From 480a359e795d59d9176251f9d98dbadffafd9793 Mon Sep 17 00:00:00 2001
From: Daniel Wirtz <daniel.wirtz.stgt at gmail.com>
Date: Thu, 18 Feb 2016 11:30:05 +1300
Subject: [PATCH]  Fixed the ignored SubDirectory directive for CPack using
  CPACK_INSTALL_CMAKE_PROJECTS

---
  Source/CPack/cmCPackGenerator.cxx | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/CPack/cmCPackGenerator.cxx 
b/Source/CPack/cmCPackGenerator.cxx
index 22d4bf0..3eca280 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -723,10 +723,9 @@ int 
cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
          cmGlobalGenerator gg(&cm);
          cmsys::auto_ptr<cmMakefile> mf(
                new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-        std::string realInstallDirectory = tempInstallDirectory;
          if ( !installSubDirectory.empty() && installSubDirectory != "/" )
            {
-          realInstallDirectory += installSubDirectory;
+          tempInstallDirectory += installSubDirectory;
            }
          if (componentInstall)
            {
--
2.7.0.windows.1


On 18.02.2016 04:56, Brad King wrote:
> On 02/16/2016 03:46 PM, Daniel Wirtz wrote:
>> i think i've encountered a bug where the fourth (=SubDirectory) entry of
>> the CPACK_INSTALL_CMAKE_PROJECTS list is simply ignored.
> [snip]
>> The offending lines of code have been committed in 2006 with
>> c09c3c6bfadb41bd0b43082642ce76abbf02df06 - i doubt that no one ever
>> tried to use something other than "/" since then?
> That appears to be the case.  There is no test case in our test suite
> for it either.  If you fix this please look at adding one.  Also update
> the documentation to clarify the use case.
>
> Thanks,
> -Brad
>

-- 
Dr. Daniel Wirtz
Dipl. Math. Dipl. Inf.
SRC SimTech
Pfaffenwaldring 5a, D-70569 Stuttgart
+49 (711) 685-60044