diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-24 21:03:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-24 21:03:37 (GMT) |
| commit | c1bbdbff57651a24fd8d7d5abe67dd24e7e6ed27 (patch) | |
| tree | 8174813d9b51f7157171198f44ac6d67c35b7939 /Source/CPack | |
| parent | d8627aa5b9a7d3e0753cc43841cd74b553fb4cdf (diff) | |
| parent | b47cffa9b892b3f4bd3d99efb4e3130440af8300 (diff) | |
| download | CMake-c1bbdbff57651a24fd8d7d5abe67dd24e7e6ed27.zip CMake-c1bbdbff57651a24fd8d7d5abe67dd24e7e6ed27.tar.gz CMake-c1bbdbff57651a24fd8d7d5abe67dd24e7e6ed27.tar.bz2 | |
Merge topic 'DoNotInvokeCPackAtCMakeTime-forCMakeTests'
b47cffa CPack: Use bin subdir when looking for dpkg and rpmbuild
a8c659c Find dpkg and rpmbuild in usual Fink and MacPort paths
848f220 Do not run cpack at CMake time it is not available.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.h | 5 | ||||
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index 7f2352f..d678cfa 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/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/bin"); // Fink + locations.push_back("/opt/local/bin"); // MacPorts + return cmSystemTools::FindProgram("dpkg",locations) != "" ? true : false; #else // legacy behavior on other systems return true; diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index eec8204..a7722bc 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/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/bin"); // Fink + locations.push_back("/opt/local/bin"); // MacPorts return cmSystemTools::FindProgram("rpmbuild") != "" ? true : false; #else // legacy behavior on other systems |