Explorar o código

Find dpkg and rpmbuild in usual Fink and MacPort paths

Eric NOULARD %!s(int64=13) %!d(string=hai) anos
pai
achega
a8c659cd6e
Modificáronse 2 ficheiros con 7 adicións e 1 borrados
  1. 4 1
      Source/CPack/cmCPackDebGenerator.h
  2. 3 0
      Source/CPack/cmCPackRPMGenerator.h

+ 4 - 1
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;

+ 3 - 0
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