Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
b47cffa9
Commit
b47cffa9
authored
Jul 20, 2012
by
David Cole
Browse files
CPack: Use bin subdir when looking for dpkg and rpmbuild
parent
a8c659cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
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
"
);
//
MacPort
s
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
"
);
//
MacPort
s
return
cmSystemTools
::
FindProgram
(
"rpmbuild"
)
!=
""
?
true
:
false
;
#else
// legacy behavior on other systems
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment