From a8c659cd6e39b14efb015e2bbee14b146a9f3be5 Mon Sep 17 00:00:00 2001 From: Eric NOULARD Date: Mon, 2 Jul 2012 19:49:07 +0200 Subject: Find dpkg and rpmbuild in usual Fink and MacPort paths --- Source/CPack/cmCPackDebGenerator.h | 5 ++++- Source/CPack/cmCPackRPMGenerator.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 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 locations; + locations.push_back("/sw"); // Fink + locations.push_back("/opt/local"); //MacPort return cmSystemTools::FindProgram("rpmbuild") != "" ? true : false; #else // legacy behavior on other systems -- cgit v0.12