Skip to content

GitLab

Commit b47cffa9 authored by David Cole's avatar David Cole
Browse files

CPack: Use bin subdir when looking for dpkg and rpmbuild

parent a8c659cd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Source/CPack/cmCPackDebGenerator.h
View file @ b47cffa9
......@@ -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
......
Source/CPack/cmCPackRPMGenerator.h
View file @ b47cffa9
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment