[Cmake-commits] CMake branch, next, updated. v2.8.7-2443-g565d4c3

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  565d4c34e67f8bdb4b5730b05d835b63a0417e08 (commit)
       via  5d18851b25af4f363d72371a5a6492741436eb37 (commit)
      from  560b231807cb6fb36925fe6fd74e393c3b9fd1fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=565d4c34e67f8bdb4b5730b05d835b63a0417e08
commit 565d4c34e67f8bdb4b5730b05d835b63a0417e08
Merge: 560b231 5d18851
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Feb 1 17:36:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 17:36:42 2012 -0500

    Merge topic 'AddTopLevelForComponent' into next
    
    5d18851 CPackArchive restore default behavior and provide new variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d18851b25af4f363d72371a5a6492741436eb37
commit 5d18851b25af4f363d72371a5a6492741436eb37
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Feb 1 23:32:50 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Feb 1 23:32:50 2012 +0100

    CPackArchive restore default behavior and provide new variable.
    
    CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY should be set by the user
    in order to get the toplevel directory included in the archive
    whenever a componentized archive is requested. This solves bug #12129
    and keeps fully backward compatible behavior.

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index 12d1796..0ff9050 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -58,7 +58,7 @@ int cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
   // Change to local toplevel
   cmSystemTools::ChangeDirectory(localToplevel.c_str());
   std::string filePrefix;
-  if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY"))
+  if (this->IsOn("CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY"))
     {
     filePrefix = this->GetOption("CPACK_PACKAGE_FILE_NAME");
     filePrefix += "/";
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 01ed4df..f7d8a4d 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -691,7 +691,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
           //  one install directory for each component.
           tempInstallDirectory +=
             GetComponentInstallDirNameSuffix(installComponent);
-          if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY"))
+          if (this->IsOn("CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY"))
             {
             tempInstallDirectory += "/";
             tempInstallDirectory += this->GetOption("CPACK_PACKAGE_FILE_NAME");

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

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.cxx |    2 +-
 Source/CPack/cmCPackGenerator.cxx        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake