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

CPack: Use bin subdir when looking for dpkg and rpmbuild

This commit is contained in:
David Cole 2012-07-20 11:43:41 -04:00
parent a8c659cd6e
commit b47cffa9b8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CPack/cmCPackDebGenerator.h
View File

@ -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

4
Source/CPack/cmCPackRPMGenerator.h
View File

@ -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