diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2012-07-02 17:49:07 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2012-07-02 17:49:07 (GMT) |
| commit | a8c659cd6e39b14efb015e2bbee14b146a9f3be5 (patch) | |
| tree | 8771cf55cabd1ff2ef82c72179504c2041f639cb | |
| parent | 848f2201c59c3d19243ed093db6e9ffbfd7b4698 (diff) | |
| download | CMake-a8c659cd6e39b14efb015e2bbee14b146a9f3be5.zip CMake-a8c659cd6e39b14efb015e2bbee14b146a9f3be5.tar.gz CMake-a8c659cd6e39b14efb015e2bbee14b146a9f3be5.tar.bz2 | |
Find dpkg and rpmbuild in usual Fink and MacPort paths
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.h | 5 | ||||
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.h | 3 |
2 files changed, 7 insertions, 1 deletions
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 |