[Cmake-commits] CMake branch, next, updated. v2.8.8-3390-g7394e7b

[David Cole]

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  7394e7bc5d3ce4cf04f28258505275c9cb2960e1 (commit)
       via  a8c659cd6e39b14efb015e2bbee14b146a9f3be5 (commit)
      from  334ae7044d368bba84d65fc8fc9e1231f5671b89 (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=7394e7bc5d3ce4cf04f28258505275c9cb2960e1
commit 7394e7bc5d3ce4cf04f28258505275c9cb2960e1
Merge: 334ae70 a8c659c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jul 9 13:37:07 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 9 13:37:07 2012 -0400

    Merge topic 'DoNotInvokeCPackAtCMakeTime-forCMakeTests' into next
    
    a8c659c Find dpkg and rpmbuild in usual Fink and MacPort paths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8c659cd6e39b14efb015e2bbee14b146a9f3be5
commit a8c659cd6e39b14efb015e2bbee14b146a9f3be5
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Jul 2 19:49:07 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Jul 2 19:49:07 2012 +0200

    Find dpkg and rpmbuild in usual Fink and MacPort paths

diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h
index 7f2352f..84b0023 100644
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@@ -35,7 +35,10 @@ public:
     {
 #ifdef __APPLE__
     // on MacOS enable CPackDeb iff dpkg is found
-    return cmSystemTools::FindProgram("dpkg") != "" ? true : false;
+    std::vector<std::string> locations;
+    locations.push_back("/sw"); // Fink
+    locations.push_back("/opt/local"); //MacPort
+    return cmSystemTools::FindProgram("dpkg",locations) != "" ? true : false;
 #else
     // legacy behavior on other systems
     return true;
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index eec8204..c7dace4 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -39,6 +39,9 @@ public:
     {
 #ifdef __APPLE__
     // on MacOS enable CPackRPM iff rpmbuild is found
+    std::vector<std::string> locations;
+    locations.push_back("/sw"); // Fink
+    locations.push_back("/opt/local"); //MacPort
     return cmSystemTools::FindProgram("rpmbuild") != "" ? true : false;
 #else
     // legacy behavior on other systems

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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.h |    5 ++++-
 Source/CPack/cmCPackRPMGenerator.h |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake