[Cmake-commits] CMake branch, master, updated. v2.8.4-367-g241de9e

[KWSys Robot]

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, master has been updated
   via  241de9e89cd8b7d1cd946a06585ae03e6031c6d8 (commit)
  from  046b615bc87eb339d185627a82bab99d27c071e6 (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=241de9e89cd8b7d1cd946a06585ae03e6031c6d8
commit 241de9e89cd8b7d1cd946a06585ae03e6031c6d8
Author: KWSys Robot 
AuthorDate: Mon Apr 18 00:01:04 2011 -0400
Commit: KWSys Robot 
CommitDate: Mon Apr 18 00:12:15 2011 -0400

KWSys Nightly Date Stamp

diff --git a/Source/kwsys/kwsysDateStamp.cmake 
b/Source/kwsys/kwsysDateStamp.cmake
index 8437d2a..dde36ea 100644
--- a/Source/kwsys/kwsysDateStamp.cmake
+++ b/Source/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2011)
 SET(KWSYS_DATE_STAMP_MONTH 04)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   17)
+SET(KWSYS_DATE_STAMP_DAY   18)

---

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.4-1453-g890d2b2

[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  890d2b2fd8d4222927e5858622ee8a81adaf98a0 (commit)
   via  d3fd945900f1fc09816cb59745c2fb241fa9b36c (commit)
   via  046b615bc87eb339d185627a82bab99d27c071e6 (commit)
   via  7b9d679b76c7c124f3a8621b6348c452c201dd71 (commit)
  from  0fdfd6529d6600f3cf7415ef28e0d2156a3b67d6 (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=890d2b2fd8d4222927e5858622ee8a81adaf98a0
commit 890d2b2fd8d4222927e5858622ee8a81adaf98a0
Merge: 0fdfd65 d3fd945
Author: Eric Noulard 
AuthorDate: Sun Apr 17 11:13:45 2011 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Apr 17 11:13:45 2011 -0400

Merge topic 'CPackRPM-fix12096' into next

d3fd945 CPackRPM  Fix #12096: handle absolute install path with component 
install
046b615 KWSys Nightly Date Stamp
7b9d679 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3fd945900f1fc09816cb59745c2fb241fa9b36c
commit d3fd945900f1fc09816cb59745c2fb241fa9b36c
Author: Eric NOULARD 
AuthorDate: Sun Apr 17 17:12:38 2011 +0200
Commit: Eric NOULARD 
CommitDate: Sun Apr 17 17:12:38 2011 +0200

CPackRPM  Fix #12096: handle absolute install path with component install

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 26209a7..d9d074c 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -495,6 +495,20 @@ EXECUTE_PROCESS(COMMAND find -type f -o -type l
 WORKING_DIRECTORY "${WDIR}"
 OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
 
+# In component case, replace CPACK_ABSOLUTE_DESTINATION_FILES
+#with the content of CPACK_ABSOLUTE_DESTINATION_FILES_
+# This must be done BEFORE the CPACK_ABSOLUTE_DESTINATION_FILES handling
+if(CPACK_RPM_PACKAGE_COMPONENT)
+  if(CPACK_ABSOLUTE_DESTINATION_FILES)
+   set(COMPONENT_FILES_TAG 
"CPACK_ABSOLUTE_DESTINATION_FILES_${CPACK_RPM_PACKAGE_COMPONENT}")
+   set(CPACK_ABSOLUTE_DESTINATION_FILES "${${COMPONENT_FILES_TAG}}")
+   if(CPACK_RPM_PACKAGE_DEBUG)
+ message("CPackRPM:Debug: Handling Absolute Destination Files 
${CPACK_ABSOLUTE_DESTINATION_FILES}")
+ message("CPackRPM:Debug: in component = ${CPACK_RPM_PACKAGE_COMPONENT}")
+   endif(CPACK_RPM_PACKAGE_DEBUG)
+  endif()
+endif()
+
 if (CPACK_ABSOLUTE_DESTINATION_FILES)
   IF(CPACK_RPM_PACKAGE_DEBUG)
 message("CPackRPM:Debug: Handling Absolute Destination Files: 
${CPACK_ABSOLUTE_DESTINATION_FILES}")
diff --git a/Source/CPack/cmCPackGenerator.cxx 
b/Source/CPack/cmCPackGenerator.cxx
index c8a77d1..7e5b26d 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -867,6 +867,28 @@ int 
cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
   cmCPackLogger(cmCPackLog::LOG_DEBUG,
 "Got some ABSOLUTE DESTINATION FILES: "
 << absoluteDestFiles << std::endl);
+  // define component specific var
+  if (componentInstall)
+{
+std::string absoluteDestFileComponent =
+std::string("CPACK_ABSOLUTE_DESTINATION_FILES")
++ "_" + GetComponentInstallDirNameSuffix(installComponent);
+if (NULL != this->GetOption(absoluteDestFileComponent.c_str()))
+  {
+std::string absoluteDestFilesListComponent =
+this->GetOption(absoluteDestFileComponent.c_str());
+absoluteDestFilesListComponent +=";";
+absoluteDestFilesListComponent +=
+mf->GetDefinition("CPACK_ABSOLUTE_DESTINATION_FILES");
+this->SetOption(absoluteDestFileComponent.c_str(),
+absoluteDestFilesListComponent.c_str());
+  }
+else
+  {
+  this->SetOption(absoluteDestFileComponent.c_str(),
+  mf->GetDefinition("CPACK_ABSOLUTE_DESTINATION_FILES"));
+  }
+}
 }
 if ( cmSystemTools::GetErrorOccuredFlag() || !res )
   {

---

Summary of changes:
 Modules/CPackRPM.cmake|   14 ++
 Source/CPack/cmCPackGenerator.cxx |   22 ++
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 3 files changed, 37 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits