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
2804a0d7
Commit
2804a0d7
authored
Dec 30, 2005
by
Andy Cedilnik
Browse files
COMP: Remove shadow variable warning
parent
081625c6
Changes
2
Show whitespace changes
Inline
Side-by-side
Source/cmFindFileCommand.cxx
View file @
2804a0d7
...
...
@@ -113,9 +113,10 @@ cmStdString cmFindFileCommand::FindHeaderInFrameworks(
const
char
*
defineVar
,
const
char
*
file
)
{
(
void
)
defineVar
;
#ifndef __APPLE__
(
void
)
path
;
(
void
)
defineVar
;
(
void
)
file
;
return
cmStdString
(
""
);
#else
...
...
@@ -150,11 +151,11 @@ cmStdString cmFindFileCommand::FindHeaderInFrameworks(
fpath
+=
"/"
;
fpath
+=
frameWorkName
;
fpath
+=
".framework"
;
std
::
string
p
ath
=
fpath
;
p
ath
+=
"/Headers/"
;
p
ath
+=
fileName
;
std
::
cerr
<<
"try "
<<
p
ath
<<
"
\n
"
;
if
(
cmSystemTools
::
FileExists
(
p
ath
.
c_str
()))
std
::
string
intP
ath
=
fpath
;
intP
ath
+=
"/Headers/"
;
intP
ath
+=
fileName
;
std
::
cerr
<<
"try "
<<
intP
ath
<<
"
\n
"
;
if
(
cmSystemTools
::
FileExists
(
intP
ath
.
c_str
()))
{
return
fpath
;
}
...
...
Source/cmGlobalXCodeGenerator.cxx
View file @
2804a0d7
...
...
@@ -1198,12 +1198,12 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
std
::
vector
<
std
::
string
>&
frameworks
=
target
.
GetFrameworks
();
if
(
frameworks
.
size
())
{
for
(
std
::
vector
<
std
::
string
>::
iterator
i
=
frameworks
.
begin
();
i
!=
frameworks
.
end
();
++
i
)
for
(
std
::
vector
<
std
::
string
>::
iterator
fmIt
=
frameworks
.
begin
();
fmIt
!=
frameworks
.
end
();
++
fmIt
)
{
if
(
emitted
.
insert
(
*
i
).
second
)
if
(
emitted
.
insert
(
*
fmIt
).
second
)
{
fdirs
+=
this
->
XCodeEscapePath
(
i
->
c_str
());
fdirs
+=
this
->
XCodeEscapePath
(
fmIt
->
c_str
());
fdirs
+=
" "
;
}
}
...
...
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