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 928dfb0de2262b1ef317ca113b262222cee60519 (commit)
via b47cffa9b892b3f4bd3d99efb4e3130440af8300 (commit)
from c306295ce376715baea6fedaa5128379dd019de4 (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=928dfb0de2262b1ef317ca113b262222cee60519
commit 928dfb0de2262b1ef317ca113b262222cee60519
Merge: c306295 b47cffa
Author: David Cole <david.c...@kitware.com>
AuthorDate: Fri Jul 20 11:55:40 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 20 11:55:40 2012 -0400
Merge topic 'DoNotInvokeCPackAtCMakeTime-forCMakeTests' into next
b47cffa CPack: Use bin subdir when looking for dpkg and rpmbuild
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b47cffa9b892b3f4bd3d99efb4e3130440af8300
commit b47cffa9b892b3f4bd3d99efb4e3130440af8300
Author: David Cole <david.c...@kitware.com>
AuthorDate: Fri Jul 20 11:43:41 2012 -0400
Commit: David Cole <david.c...@kitware.com>
CommitDate: Fri Jul 20 11:53:56 2012 -0400
CPack: Use bin subdir when looking for dpkg and rpmbuild
diff --git a/Source/CPack/cmCPackDebGenerator.h
b/Source/CPack/cmCPackDebGenerator.h
index 84b0023..d678cfa 100644
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@@ -36,8 +36,8 @@ public:
#ifdef __APPLE__
// on MacOS enable CPackDeb iff dpkg is found
std::vector<std::string> locations;
- locations.push_back("/sw"); // Fink
- locations.push_back("/opt/local"); //MacPort
+ locations.push_back("/sw/bin"); // Fink
+ locations.push_back("/opt/local/bin"); // MacPorts
return cmSystemTools::FindProgram("dpkg",locations) != "" ? true : false;
#else
// legacy behavior on other systems
diff --git a/Source/CPack/cmCPackRPMGenerator.h
b/Source/CPack/cmCPackRPMGenerator.h
index c7dace4..a7722bc 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -40,8 +40,8 @@ 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
+ locations.push_back("/sw/bin"); // Fink
+ locations.push_back("/opt/local/bin"); // MacPorts
return cmSystemTools::FindProgram("rpmbuild") != "" ? true : false;
#else
// legacy behavior on other systems
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackDebGenerator.h | 4 ++--
Source/CPack/cmCPackRPMGenerator.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
