Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sylvain Joubert
CMake
Commits
40bee43a
Commit
40bee43a
authored
8 years ago
by
Brad King
Browse files
Options
Downloads
Patches
Plain Diff
cmCPackDragNDropGenerator: Replace std::{ostringstream => string}
parent
7d2a0aa7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Source/CPack/cmCPackDragNDropGenerator.cxx
+4
-5
4 additions, 5 deletions
Source/CPack/cmCPackDragNDropGenerator.cxx
with
4 additions
and
5 deletions
Source/CPack/cmCPackDragNDropGenerator.cxx
+
4
−
5
View file @
40bee43a
...
...
@@ -447,12 +447,11 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
cmsys
::
RegularExpression
mountpoint_regex
(
".*(/Volumes/[^
\n
]+)
\n
.*"
);
mountpoint_regex
.
find
(
attach_output
.
c_str
());
std
::
ostringstream
temp_mount
;
temp_mount
<<
mountpoint_regex
.
match
(
1
);
std
::
string
const
temp_mount
=
mountpoint_regex
.
match
(
1
);
// Remove dummy padding file so we have enough space on RW image ...
std
::
ostringstream
dummy_padding
;
dummy_padding
<<
temp_mount
.
str
()
<<
"/.dummy-padding-file"
;
dummy_padding
<<
temp_mount
<<
"/.dummy-padding-file"
;
if
(
!
cmSystemTools
::
RemoveFile
(
dummy_padding
.
str
()))
{
cmCPackLogger
(
cmCPackLog
::
LOG_ERROR
,
"Error removing dummy padding file."
<<
std
::
endl
);
...
...
@@ -465,7 +464,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
std
::
ostringstream
setfile_command
;
setfile_command
<<
this
->
GetOption
(
"CPACK_COMMAND_SETFILE"
);
setfile_command
<<
" -a C"
;
setfile_command
<<
"
\"
"
<<
temp_mount
.
str
()
<<
"
\"
"
;
setfile_command
<<
"
\"
"
<<
temp_mount
<<
"
\"
"
;
if
(
!
this
->
RunCommand
(
setfile_command
))
{
cmCPackLogger
(
cmCPackLog
::
LOG_ERROR
,
...
...
@@ -497,7 +496,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
std
::
ostringstream
detach_command
;
detach_command
<<
this
->
GetOption
(
"CPACK_COMMAND_HDIUTIL"
);
detach_command
<<
" detach"
;
detach_command
<<
"
\"
"
<<
temp_mount
.
str
()
<<
"
\"
"
;
detach_command
<<
"
\"
"
<<
temp_mount
<<
"
\"
"
;
if
(
!
this
->
RunCommand
(
detach_command
))
{
cmCPackLogger
(
cmCPackLog
::
LOG_ERROR
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment