Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
CMake
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2,684
Issues
2,684
List
Boards
Labels
Milestones
Merge Requests
21
Merge Requests
21
Packages
Packages
Container Registry
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
CMake
CMake
Commits
1365e18b
Commit
1365e18b
authored
Oct 04, 2016
by
Stephen Kelly
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert: Inline platform-specific methods
They don't provide real value.
parent
1ed5f6b3
Pipeline
#29736
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
28 deletions
+4
-28
Source/cmOutputConverter.cxx
Source/cmOutputConverter.cxx
+3
-16
Source/cmOutputConverter.h
Source/cmOutputConverter.h
+1
-12
No files found.
Source/cmOutputConverter.cxx
View file @
1365e18b
...
...
@@ -240,9 +240,8 @@ std::string cmOutputConverter::EscapeForShell(const std::string& str,
flags
|=
Shell_Flag_NMake
;
}
return
this
->
GetState
()
->
UseWindowsShell
()
?
Shell_GetArgumentForWindows
(
str
.
c_str
(),
flags
)
:
Shell_GetArgumentForUnix
(
str
.
c_str
(),
flags
);
return
Shell__GetArgument
(
str
.
c_str
(),
!
this
->
GetState
()
->
UseWindowsShell
(),
flags
);
}
std
::
string
cmOutputConverter
::
EscapeForCMake
(
const
std
::
string
&
str
)
...
...
@@ -271,7 +270,7 @@ std::string cmOutputConverter::EscapeForCMake(const std::string& str)
std
::
string
cmOutputConverter
::
EscapeWindowsShellArgument
(
const
char
*
arg
,
int
shell_flags
)
{
return
Shell_
GetArgumentForWindows
(
arg
,
shell_flags
);
return
Shell_
_GetArgument
(
arg
,
0
,
shell_flags
);
}
cmOutputConverter
::
FortranFormat
cmOutputConverter
::
GetFortranFormat
(
...
...
@@ -632,15 +631,3 @@ std::string cmOutputConverter::Shell__GetArgument(const char* in, int isUnix,
return
out
.
str
();
}
std
::
string
cmOutputConverter
::
Shell_GetArgumentForWindows
(
const
char
*
in
,
int
flags
)
{
return
Shell__GetArgument
(
in
,
0
,
flags
);
}
std
::
string
cmOutputConverter
::
Shell_GetArgumentForUnix
(
const
char
*
in
,
int
flags
)
{
return
Shell__GetArgument
(
in
,
1
,
flags
);
}
Source/cmOutputConverter.h
View file @
1365e18b
...
...
@@ -33,8 +33,7 @@ public:
void
SetLinkScriptShell
(
bool
linkScriptShell
);
/**
* Flags to pass to Shell_GetArgumentForWindows or
* Shell_GetArgumentForUnix. These modify the generated
* Flags to pass to Shell_GetArgument. These modify the generated
* quoting and escape sequences to work under alternative
* environments.
*/
...
...
@@ -70,16 +69,6 @@ public:
Shell_Flag_WatcomQuote
=
(
1
<<
7
)
};
/**
* Transform the given command line argument for use in a Windows or
* Unix shell. Returns a pointer to the end of the command line
* argument in the provided output buffer. Flags may be passed to
* modify the generated quoting and escape sequences to work under
* alternative environments.
*/
static
std
::
string
Shell_GetArgumentForWindows
(
const
char
*
in
,
int
flags
);
static
std
::
string
Shell_GetArgumentForUnix
(
const
char
*
in
,
int
flags
);
std
::
string
EscapeForShell
(
const
std
::
string
&
str
,
bool
makeVars
=
false
,
bool
forEcho
=
false
,
bool
useWatcomQuote
=
false
)
const
;
...
...
Brad King
@brad.king
Mentioned in commit
9c4d1056
·
Oct 07, 2016
Mentioned in commit
9c4d1056
Mentioned in commit 9c4d105680c99e194c6d6063315ee2affd2a7b63
Toggle commit list
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