Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
4fe963f6
Commit
4fe963f6
authored
Nov 20, 2013
by
Stephen Kelly
Browse files
Use new cmHasLiteralPrefix function
parent
7d4b2b2e
Changes
16
Hide whitespace changes
Inline
Side-by-side
Source/CTest/cmCTestBuildHandler.cxx
View file @
4fe963f6
...
...
@@ -763,7 +763,7 @@ void cmCTestBuildHandler::GenerateXMLLaunchedFragment(std::ostream& os,
bool
cmCTestBuildHandler
::
IsLaunchedErrorFile
(
const
char
*
fname
)
{
// error-{hash}.xml
return
(
strncmp
(
fname
,
"error-"
,
6
)
==
0
&&
return
(
cmHasLiteralPrefix
(
fname
,
"error-"
)
&&
strcmp
(
fname
+
strlen
(
fname
)
-
4
,
".xml"
)
==
0
);
}
...
...
@@ -771,7 +771,7 @@ bool cmCTestBuildHandler::IsLaunchedErrorFile(const char* fname)
bool
cmCTestBuildHandler
::
IsLaunchedWarningFile
(
const
char
*
fname
)
{
// warning-{hash}.xml
return
(
strncmp
(
fname
,
"warning-"
,
8
)
==
0
&&
return
(
cmHasLiteralPrefix
(
fname
,
"warning-"
)
&&
strcmp
(
fname
+
strlen
(
fname
)
-
4
,
".xml"
)
==
0
);
}
...
...
Source/CTest/cmCTestGIT.cxx
View file @
4fe963f6
...
...
@@ -536,11 +536,11 @@ private:
void
DoHeaderLine
()
{
// Look for header fields that we need.
if
(
strncmp
(
this
->
Line
.
c_str
(),
"commit "
,
7
)
==
0
)
if
(
cmHasLiteralPrefix
(
this
->
Line
.
c_str
(),
"commit "
)
)
{
this
->
Rev
.
Rev
=
this
->
Line
.
c_str
()
+
7
;
}
else
if
(
strncmp
(
this
->
Line
.
c_str
(),
"author "
,
7
)
==
0
)
else
if
(
cmHasLiteralPrefix
(
this
->
Line
.
c_str
(),
"author "
)
)
{
Person
author
;
this
->
ParsePerson
(
this
->
Line
.
c_str
()
+
7
,
author
);
...
...
@@ -548,7 +548,7 @@ private:
this
->
Rev
.
EMail
=
author
.
EMail
;
this
->
Rev
.
Date
=
this
->
FormatDateTime
(
author
);
}
else
if
(
strncmp
(
this
->
Line
.
c_str
(),
"committer "
,
10
)
==
0
)
else
if
(
cmHasLiteralPrefix
(
this
->
Line
.
c_str
(),
"committer "
)
)
{
Person
committer
;
this
->
ParsePerson
(
this
->
Line
.
c_str
()
+
10
,
committer
);
...
...
Source/cmCTest.cxx
View file @
4fe963f6
...
...
@@ -1131,11 +1131,11 @@ int cmCTest::GetTestModelFromString(const char* str)
return
cmCTest
::
EXPERIMENTAL
;
}
std
::
string
rstr
=
cmSystemTools
::
LowerCase
(
str
);
if
(
strncmp
(
rstr
.
c_str
(),
"cont"
,
4
)
==
0
)
if
(
cmHasLiteralPrefix
(
rstr
.
c_str
(),
"cont"
)
)
{
return
cmCTest
::
CONTINUOUS
;
}
if
(
strncmp
(
rstr
.
c_str
(),
"nigh"
,
4
)
==
0
)
if
(
cmHasLiteralPrefix
(
rstr
.
c_str
(),
"nigh"
)
)
{
return
cmCTest
::
NIGHTLY
;
}
...
...
Source/cmExportFileGenerator.cxx
View file @
4fe963f6
...
...
@@ -240,7 +240,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
{
continue
;
}
if
(
strncmp
(
li
->
c_str
(),
"${_IMPORT_PREFIX}"
,
17
)
==
0
)
if
(
cmHasLiteralPrefix
(
li
->
c_str
(),
"${_IMPORT_PREFIX}"
)
)
{
continue
;
}
...
...
Source/cmExportInstallFileGenerator.cxx
View file @
4fe963f6
...
...
@@ -81,10 +81,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
os
<<
"# Compute the installation prefix relative to this file.
\n
"
<<
"get_filename_component(_IMPORT_PREFIX"
<<
"
\"
${CMAKE_CURRENT_LIST_FILE}
\"
PATH)
\n
"
;
if
(
strncmp
(
absDestS
.
c_str
(),
"/lib/"
,
5
)
==
0
||
strncmp
(
absDestS
.
c_str
(),
"/lib64/"
,
7
)
==
0
||
strncmp
(
absDestS
.
c_str
(),
"/usr/lib/"
,
9
)
==
0
||
strncmp
(
absDestS
.
c_str
(),
"/usr/lib64/"
,
11
)
==
0
)
if
(
cmHasLiteralPrefix
(
absDestS
.
c_str
(),
"/lib/"
)
||
cmHasLiteralPrefix
(
absDestS
.
c_str
(),
"/lib64/"
)
||
cmHasLiteralPrefix
(
absDestS
.
c_str
(),
"/usr/lib/"
)
||
cmHasLiteralPrefix
(
absDestS
.
c_str
(),
"/usr/lib64/"
)
)
{
// Handle "/usr move" symlinks created by some Linux distros.
os
<<
...
...
Source/cmGeneratorExpressionDAGChecker.cxx
View file @
4fe963f6
...
...
@@ -173,8 +173,8 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(const char *tgt)
return
(
strcmp
(
prop
,
"LINK_LIBRARIES"
)
==
0
||
strcmp
(
prop
,
"LINK_INTERFACE_LIBRARIES"
)
==
0
||
strcmp
(
prop
,
"IMPORTED_LINK_INTERFACE_LIBRARIES"
)
==
0
||
strncmp
(
prop
,
"LINK_INTERFACE_LIBRARIES_"
,
25
)
==
0
||
strncmp
(
prop
,
"IMPORTED_LINK_INTERFACE_LIBRARIES_"
,
34
)
==
0
)
||
cmHasLiteralPrefix
(
prop
,
"LINK_INTERFACE_LIBRARIES_"
)
||
cmHasLiteralPrefix
(
prop
,
"IMPORTED_LINK_INTERFACE_LIBRARIES_"
)
)
||
strcmp
(
prop
,
"INTERFACE_LINK_LIBRARIES"
)
==
0
;
}
...
...
@@ -200,7 +200,7 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingCompileDefinitions() const
const
char
*
prop
=
this
->
Property
.
c_str
();
return
(
strcmp
(
prop
,
"COMPILE_DEFINITIONS"
)
==
0
||
strcmp
(
prop
,
"INTERFACE_COMPILE_DEFINITIONS"
)
==
0
||
strncmp
(
prop
,
"COMPILE_DEFINITIONS_"
,
20
)
==
0
);
||
cmHasLiteralPrefix
(
prop
,
"COMPILE_DEFINITIONS_"
)
);
}
//----------------------------------------------------------------------------
...
...
Source/cmGeneratorExpressionEvaluator.cxx
View file @
4fe963f6
...
...
@@ -902,8 +902,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME
(
POPULATE_INTERFACE_PROPERTY_NAME
)
// Note that the above macro terminates with an else
/* else */
if
(
strncmp
(
propertyName
.
c_str
(),
"COMPILE_DEFINITIONS_"
,
20
)
==
0
)
/* else */
if
(
cmHasLiteralPrefix
(
propertyName
.
c_str
(),
"COMPILE_DEFINITIONS_"
)
)
{
interfacePropertyName
=
"INTERFACE_COMPILE_DEFINITIONS"
;
}
...
...
Source/cmGlobalVisualStudio10Generator.cxx
View file @
4fe963f6
...
...
@@ -28,7 +28,7 @@ static const char* cmVS10GenName(const char* name, std::string& genName)
return
0
;
}
const
char
*
p
=
name
+
sizeof
(
vs10generatorName
)
-
6
;
if
(
strncmp
(
p
,
" 2010"
,
5
)
==
0
)
if
(
cmHasLiteralPrefix
(
p
,
" 2010"
)
)
{
p
+=
5
;
}
...
...
Source/cmGlobalVisualStudio11Generator.cxx
View file @
4fe963f6
...
...
@@ -23,7 +23,7 @@ static const char* cmVS11GenName(const char* name, std::string& genName)
return
0
;
}
const
char
*
p
=
name
+
sizeof
(
vs11generatorName
)
-
6
;
if
(
strncmp
(
p
,
" 2012"
,
5
)
==
0
)
if
(
cmHasLiteralPrefix
(
p
,
" 2012"
)
)
{
p
+=
5
;
}
...
...
Source/cmGlobalVisualStudio12Generator.cxx
View file @
4fe963f6
...
...
@@ -23,7 +23,7 @@ static const char* cmVS12GenName(const char* name, std::string& genName)
return
0
;
}
const
char
*
p
=
name
+
sizeof
(
vs12generatorName
)
-
6
;
if
(
strncmp
(
p
,
" 2013"
,
5
)
==
0
)
if
(
cmHasLiteralPrefix
(
p
,
" 2013"
)
)
{
p
+=
5
;
}
...
...
Source/cmOutputRequiredFilesCommand.cxx
View file @
4fe963f6
...
...
@@ -32,7 +32,7 @@ void cmLBDepend::DependWalk(cmDependInformation* info)
std
::
string
line
;
while
(
cmSystemTools
::
GetLineFromStream
(
fin
,
line
))
{
if
(
!
strncmp
(
line
.
c_str
(),
"#include"
,
8
))
if
(
cmHasLiteralPrefix
(
line
.
c_str
(),
"#include"
))
{
// if it is an include line then create a string class
std
::
string
currentline
=
line
;
...
...
Source/cmSetCommand.cxx
View file @
4fe963f6
...
...
@@ -23,7 +23,7 @@ bool cmSetCommand
// watch for ENV signatures
const
char
*
variable
=
args
[
0
].
c_str
();
// VAR is always first
if
(
!
strncmp
(
variable
,
"ENV{"
,
4
)
&&
strlen
(
variable
)
>
5
)
if
(
cmHasLiteralPrefix
(
variable
,
"ENV{"
)
&&
strlen
(
variable
)
>
5
)
{
// what is the variable name
char
*
varName
=
new
char
[
strlen
(
variable
)];
...
...
Source/cmTarget.cxx
View file @
4fe963f6
...
...
@@ -560,7 +560,7 @@ cmSourceFile* cmTarget::AddSource(const char* s)
//----------------------------------------------------------------------------
void
cmTarget
::
ProcessSourceExpression
(
std
::
string
const
&
expr
)
{
if
(
strncmp
(
expr
.
c_str
(),
"$<TARGET_OBJECTS:"
,
17
)
==
0
&&
if
(
cmHasLiteralPrefix
(
expr
.
c_str
(),
"$<TARGET_OBJECTS:"
)
&&
expr
[
expr
.
size
()
-
1
]
==
'>'
)
{
std
::
string
objLibName
=
expr
.
substr
(
17
,
expr
.
size
()
-
18
);
...
...
@@ -2199,11 +2199,11 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
void
cmTarget
::
MaybeInvalidatePropertyCache
(
const
char
*
prop
)
{
// Wipe out maps caching information affected by this property.
if
(
this
->
IsImported
()
&&
strncmp
(
prop
,
"IMPORTED"
,
8
)
==
0
)
if
(
this
->
IsImported
()
&&
cmHasLiteralPrefix
(
prop
,
"IMPORTED"
)
)
{
this
->
Internal
->
ImportInfoMap
.
clear
();
}
if
(
!
this
->
IsImported
()
&&
strncmp
(
prop
,
"LINK_INTERFACE_"
,
15
)
==
0
)
if
(
!
this
->
IsImported
()
&&
cmHasLiteralPrefix
(
prop
,
"LINK_INTERFACE_"
)
)
{
this
->
ClearLinkMaps
();
}
...
...
@@ -2279,21 +2279,21 @@ static void cmTargetCheckINTERFACE_LINK_LIBRARIES(const char* value,
void
cmTarget
::
CheckProperty
(
const
char
*
prop
,
cmMakefile
*
context
)
{
// Certain properties need checking.
if
(
strncmp
(
prop
,
"LINK_INTERFACE_LIBRARIES"
,
24
)
==
0
)
if
(
cmHasLiteralPrefix
(
prop
,
"LINK_INTERFACE_LIBRARIES"
)
)
{
if
(
const
char
*
value
=
this
->
GetProperty
(
prop
))
{
cmTargetCheckLINK_INTERFACE_LIBRARIES
(
prop
,
value
,
context
,
false
);
}
}
if
(
strncmp
(
prop
,
"IMPORTED_LINK_INTERFACE_LIBRARIES"
,
33
)
==
0
)
if
(
cmHasLiteralPrefix
(
prop
,
"IMPORTED_LINK_INTERFACE_LIBRARIES"
)
)
{
if
(
const
char
*
value
=
this
->
GetProperty
(
prop
))
{
cmTargetCheckLINK_INTERFACE_LIBRARIES
(
prop
,
value
,
context
,
true
);
}
}
if
(
strncmp
(
prop
,
"INTERFACE_LINK_LIBRARIES"
,
24
)
==
0
)
if
(
cmHasLiteralPrefix
(
prop
,
"INTERFACE_LINK_LIBRARIES"
)
)
{
if
(
const
char
*
value
=
this
->
GetProperty
(
prop
))
{
...
...
@@ -2595,7 +2595,7 @@ const char *cmTarget::GetProperty(const char* prop,
}
// Support "LOCATION_<CONFIG>".
if
(
strncmp
(
prop
,
"LOCATION_"
,
9
)
==
0
)
if
(
cmHasLiteralPrefix
(
prop
,
"LOCATION_"
)
)
{
if
(
!
this
->
HandleLocationPropertyPolicy
())
{
...
...
Source/cmTargetCompileDefinitionsCommand.cxx
View file @
4fe963f6
...
...
@@ -44,7 +44,7 @@ std::string cmTargetCompileDefinitionsCommand
for
(
std
::
vector
<
std
::
string
>::
const_iterator
it
=
content
.
begin
();
it
!=
content
.
end
();
++
it
)
{
if
(
strncmp
(
it
->
c_str
(),
"-D"
,
2
)
==
0
)
if
(
cmHasLiteralPrefix
(
it
->
c_str
(),
"-D"
)
)
{
defs
+=
sep
+
it
->
substr
(
2
);
}
...
...
Source/cmUnsetCommand.cxx
View file @
4fe963f6
...
...
@@ -24,7 +24,7 @@ bool cmUnsetCommand::InitialPass(std::vector<std::string> const& args,
const
char
*
variable
=
args
[
0
].
c_str
();
// unset(ENV{VAR})
if
(
!
strncmp
(
variable
,
"ENV{"
,
4
)
&&
strlen
(
variable
)
>
5
)
if
(
cmHasLiteralPrefix
(
variable
,
"ENV{"
)
&&
strlen
(
variable
)
>
5
)
{
// what is the variable name
char
*
envVarName
=
new
char
[
strlen
(
variable
)];
...
...
Source/cmakemain.cxx
View file @
4fe963f6
...
...
@@ -273,7 +273,7 @@ int do_cmake(int ac, char** av)
list_all_cached
=
true
;
list_help
=
true
;
}
else
if
(
strncmp
(
av
[
i
],
"-P"
,
strlen
(
"-P"
))
==
0
)
else
if
(
cmHasLiteralPrefix
(
av
[
i
],
"-P"
)
)
{
if
(
i
==
ac
-
1
)
{
...
...
@@ -287,8 +287,7 @@ int do_cmake(int ac, char** av)
args
.
push_back
(
av
[
i
]);
}
}
else
if
(
strncmp
(
av
[
i
],
"--find-package"
,
strlen
(
"--find-package"
))
==
0
)
else
if
(
cmHasLiteralPrefix
(
av
[
i
],
"--find-package"
))
{
workingMode
=
cmake
::
FIND_PACKAGE_MODE
;
args
.
push_back
(
av
[
i
]);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment