kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Find dpkg and rpmbuild in usual Fink and MacPort paths

Browse Source
This commit is contained in:
Eric NOULARD 2012-07-02 19:49:07 +02:00
parent 848f2201c5
commit a8c659cd6e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CPack/cmCPackDebGenerator.h
View File

@ -35,7 +35,10 @@ public:
{ {
#ifdef __APPLE__ #ifdef __APPLE__
// on MacOS enable CPackDeb iff dpkg is found // 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 #else
// legacy behavior on other systems // legacy behavior on other systems
return true; return true;

3
Source/CPack/cmCPackRPMGenerator.h
View File

@ -39,6 +39,9 @@ public:
{ {
#ifdef __APPLE__ #ifdef __APPLE__
// on MacOS enable CPackRPM iff rpmbuild is found // 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; return cmSystemTools::FindProgram("rpmbuild") != "" ? true : false;
#else #else
// legacy behavior on other systems // legacy behavior on other systems