diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-20 15:43:41 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-07-20 15:53:56 (GMT) |
| commit | b47cffa9b892b3f4bd3d99efb4e3130440af8300 (patch) | |
| tree | 52b4e3224d526e734aed221f201fd1c6f408dd25 | |
| parent | a8c659cd6e39b14efb015e2bbee14b146a9f3be5 (diff) | |
| download | CMake-b47cffa9b892b3f4bd3d99efb4e3130440af8300.zip CMake-b47cffa9b892b3f4bd3d99efb4e3130440af8300.tar.gz CMake-b47cffa9b892b3f4bd3d99efb4e3130440af8300.tar.bz2 | |
CPack: Use bin subdir when looking for dpkg and rpmbuild
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.h | 4 | ||||
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index 84b0023..d678cfa 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -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 diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index c7dace4..a7722bc 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -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 |