Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Peter Stroia-Williams
CMake
Commits
b8746c4c
Commit
b8746c4c
authored
Jun 03, 2015
by
Brad King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'CPackDeb-dpkg-shlibdeps-check-flag' into release
parents
c2cb80cb
39fc3ed7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
Modules/CPackDeb.cmake
Modules/CPackDeb.cmake
+11
-7
No files found.
Modules/CPackDeb.cmake
View file @
b8746c4c
...
...
@@ -352,10 +352,11 @@ function(cpack_deb_prepare_package_vars)
OUTPUT_VARIABLE _TMP_VERSION
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string
(
REGEX MATCH
"dpkg-shlibdeps version ([0-9]+
\\
.[0-9]+
\\
.[0-9]+)"
SHLIBDEPS_EXECUTABLE_VERSION
"
${
_TMP_VERSION
}
"
)
set
(
SHLIBDEPS_EXECUTABLE_VERSION
"
${
CMAKE_MATCH_1
}
"
)
if
(
_TMP_VERSION MATCHES
"dpkg-shlibdeps version ([0-9]+
\\
.[0-9]+
\\
.[0-9]+)"
)
set
(
SHLIBDEPS_EXECUTABLE_VERSION
"
${
CMAKE_MATCH_1
}
"
)
else
()
set
(
SHLIBDEPS_EXECUTABLE_VERSION
""
)
endif
()
if
(
CPACK_DEBIAN_PACKAGE_DEBUG
)
message
(
"CPackDeb Debug: dpkg-shlibdeps --version output is '
${
_TMP_VERSION
}
'"
)
...
...
@@ -398,9 +399,12 @@ function(cpack_deb_prepare_package_vars)
file
(
MAKE_DIRECTORY
${
CPACK_TEMPORARY_DIRECTORY
}
/debian
)
file
(
WRITE
${
CPACK_TEMPORARY_DIRECTORY
}
/debian/control
""
)
# only set ignore-missing-info flag for dpkg-shlibdeps that have --version option
# (those are newer and also have --ignore-missing-info flag)
if
(
SHLIBDEPS_EXECUTABLE_VERSION
)
# Add --ignore-missing-info if the tool supports it
execute_process
(
COMMAND env LC_ALL=C
${
SHLIBDEPS_EXECUTABLE
}
--help
OUTPUT_VARIABLE _TMP_HELP
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
_TMP_HELP MATCHES
"--ignore-missing-info"
)
set
(
IGNORE_MISSING_INFO_FLAG
"--ignore-missing-info"
)
endif
()
...
...
Write
Preview
Markdown
is supported
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