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
CMake
CMake
Commits
4651dbcf
Commit
4651dbcf
authored
Mar 05, 2002
by
Bill Hoffman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: expand variables in arguments before the commands get them
parent
2b9140f6
Changes
37
Hide whitespace changes
Inline
Side-by-side
Showing
37 changed files
with
44 additions
and
138 deletions
+44
-138
Source/cmAddCustomCommandCommand.cxx
Source/cmAddCustomCommandCommand.cxx
+1
-3
Source/cmAddCustomTargetCommand.cxx
Source/cmAddCustomTargetCommand.cxx
+3
-6
Source/cmAddDefinitionsCommand.cxx
Source/cmAddDefinitionsCommand.cxx
+1
-3
Source/cmAddDependenciesCommand.cxx
Source/cmAddDependenciesCommand.cxx
+1
-12
Source/cmAddExecutableCommand.cxx
Source/cmAddExecutableCommand.cxx
+0
-7
Source/cmAddLibraryCommand.cxx
Source/cmAddLibraryCommand.cxx
+1
-5
Source/cmAddTestCommand.cxx
Source/cmAddTestCommand.cxx
+1
-3
Source/cmBuildCommand.cxx
Source/cmBuildCommand.cxx
+0
-1
Source/cmCableClassSetCommand.cxx
Source/cmCableClassSetCommand.cxx
+3
-10
Source/cmCableWrapTclCommand.cxx
Source/cmCableWrapTclCommand.cxx
+2
-10
Source/cmConfigureFileCommand.cxx
Source/cmConfigureFileCommand.cxx
+0
-2
Source/cmElseCommand.cxx
Source/cmElseCommand.cxx
+1
-3
Source/cmEndIfCommand.cxx
Source/cmEndIfCommand.cxx
+0
-1
Source/cmExecProgramCommand.cxx
Source/cmExecProgramCommand.cxx
+1
-4
Source/cmFindFileCommand.cxx
Source/cmFindFileCommand.cxx
+1
-4
Source/cmFindLibraryCommand.cxx
Source/cmFindLibraryCommand.cxx
+0
-3
Source/cmFindPathCommand.cxx
Source/cmFindPathCommand.cxx
+0
-1
Source/cmFindProgramCommand.cxx
Source/cmFindProgramCommand.cxx
+0
-2
Source/cmGetFilenameComponentCommand.cxx
Source/cmGetFilenameComponentCommand.cxx
+0
-1
Source/cmIfCommand.cxx
Source/cmIfCommand.cxx
+1
-4
Source/cmIncludeCommand.cxx
Source/cmIncludeCommand.cxx
+2
-4
Source/cmIncludeExternalMSProjectCommand.cxx
Source/cmIncludeExternalMSProjectCommand.cxx
+0
-1
Source/cmInstallFilesCommand.cxx
Source/cmInstallFilesCommand.cxx
+0
-2
Source/cmInstallProgramsCommand.cxx
Source/cmInstallProgramsCommand.cxx
+1
-4
Source/cmLoadCacheCommand.cxx
Source/cmLoadCacheCommand.cxx
+2
-6
Source/cmMakeDirectoryCommand.cxx
Source/cmMakeDirectoryCommand.cxx
+1
-3
Source/cmMakefile.cxx
Source/cmMakefile.cxx
+14
-2
Source/cmMessageCommand.cxx
Source/cmMessageCommand.cxx
+0
-1
Source/cmOptionCommand.cxx
Source/cmOptionCommand.cxx
+0
-1
Source/cmOutputRequiredFilesCommand.cxx
Source/cmOutputRequiredFilesCommand.cxx
+0
-4
Source/cmSetCommand.cxx
Source/cmSetCommand.cxx
+0
-2
Source/cmSourceFilesCommand.cxx
Source/cmSourceFilesCommand.cxx
+0
-2
Source/cmSubdirCommand.cxx
Source/cmSubdirCommand.cxx
+1
-3
Source/cmSystemTools.cxx
Source/cmSystemTools.cxx
+0
-1
Source/cmUnixMakefileGenerator.cxx
Source/cmUnixMakefileGenerator.cxx
+1
-1
Source/cmUseMangledMesaCommand.cxx
Source/cmUseMangledMesaCommand.cxx
+2
-5
Source/cmVTKMakeInstantiatorCommand.cxx
Source/cmVTKMakeInstantiatorCommand.cxx
+3
-11
No files found.
Source/cmAddCustomCommandCommand.cxx
View file @
4651dbcf
...
...
@@ -48,8 +48,7 @@ bool cmAddCustomCommandCommand::InitialPass(std::vector<std::string> const& args
for
(
unsigned
int
j
=
0
;
j
<
args
.
size
();
++
j
)
{
std
::
string
copy
=
args
[
j
];
m_Makefile
->
ExpandVariablesInString
(
copy
);
std
::
string
const
&
copy
=
args
[
j
];
if
(
copy
==
"SOURCE"
)
{
...
...
@@ -124,7 +123,6 @@ bool cmAddCustomCommandCommand::InitialPass(std::vector<std::string> const& args
this
->
SetError
(
"Wrong syntax. Empty TARGET."
);
return
false
;
}
m_Makefile
->
AddCustomCommand
(
source
.
c_str
(),
command
.
c_str
(),
command_args
,
...
...
Source/cmAddCustomTargetCommand.cxx
View file @
4651dbcf
...
...
@@ -17,9 +17,8 @@
#include "cmAddCustomTargetCommand.h"
// cmAddCustomTargetCommand
bool
cmAddCustomTargetCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
In
)
bool
cmAddCustomTargetCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
std
::
vector
<
std
::
string
>
args
=
argsIn
;
bool
all
=
false
;
if
(
args
.
size
()
<
2
)
...
...
@@ -27,11 +26,10 @@ bool cmAddCustomTargetCommand::InitialPass(std::vector<std::string> const& argsI
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
m_Makefile
->
ExpandVariablesInString
(
args
[
0
]);
// all target option
std
::
string
arguments
;
std
::
vector
<
std
::
string
>::
iterator
s
=
args
.
begin
();
std
::
vector
<
std
::
string
>::
const_
iterator
s
=
args
.
begin
();
++
s
;
// move past args[0] as it is already to be used
if
(
args
.
size
()
>=
3
)
{
...
...
@@ -44,12 +42,11 @@ bool cmAddCustomTargetCommand::InitialPass(std::vector<std::string> const& argsI
std
::
string
command
;
if
(
s
!=
args
.
end
())
{
command
=
m_Makefile
->
ExpandVariablesInString
(
*
s
)
;
command
=
*
s
;
++
s
;
}
for
(;
s
!=
args
.
end
();
++
s
)
{
m_Makefile
->
ExpandVariablesInString
(
*
s
);
arguments
+=
cmSystemTools
::
EscapeSpaces
(
s
->
c_str
());
arguments
+=
" "
;
}
...
...
Source/cmAddDefinitionsCommand.cxx
View file @
4651dbcf
...
...
@@ -27,9 +27,7 @@ bool cmAddDefinitionsCommand::InitialPass(std::vector<std::string> const& args)
for
(
std
::
vector
<
std
::
string
>::
const_iterator
i
=
args
.
begin
();
i
!=
args
.
end
();
++
i
)
{
std
::
string
str
=
*
i
;
m_Makefile
->
ExpandVariablesInString
(
str
);
m_Makefile
->
AddDefineFlag
(
str
.
c_str
());
m_Makefile
->
AddDefineFlag
(
i
->
c_str
());
}
return
true
;
}
...
...
Source/cmAddDependenciesCommand.cxx
View file @
4651dbcf
...
...
@@ -27,7 +27,6 @@ bool cmAddDependenciesCommand::InitialPass(std::vector<std::string> const& args)
}
std
::
string
target_name
=
args
[
0
];
m_Makefile
->
ExpandVariablesInString
(
target_name
);
cmTargets
&
tgts
=
m_Makefile
->
GetTargets
();
if
(
tgts
.
find
(
target_name
)
!=
tgts
.
end
())
...
...
@@ -37,21 +36,11 @@ bool cmAddDependenciesCommand::InitialPass(std::vector<std::string> const& args)
std
::
string
depend_target
;
for
(;
s
!=
args
.
end
();
++
s
)
{
depend_target
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
depend_target
);
tgts
[
target_name
].
AddUtility
(
depend_target
.
c_str
());
tgts
[
target_name
].
AddUtility
(
s
->
c_str
());
}
}
else
{
std
::
cerr
<<
"existing targets are:"
;
for
(
cmTargets
::
iterator
i
=
tgts
.
begin
();
i
!=
tgts
.
end
();
++
i
)
{
std
::
cerr
<<
i
->
first
<<
std
::
endl
;
}
std
::
string
error
=
"Adding dependency to non-existent target: "
;
error
+=
target_name
;
this
->
SetError
(
error
.
c_str
());
...
...
Source/cmAddExecutableCommand.cxx
View file @
4651dbcf
...
...
@@ -29,7 +29,6 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
std
::
vector
<
std
::
string
>::
const_iterator
s
=
args
.
begin
();
std
::
string
exename
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
exename
);
++
s
;
bool
use_win32
=
false
;
...
...
@@ -41,12 +40,6 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
}
std
::
vector
<
std
::
string
>
srclists
(
s
,
args
.
end
());
for
(
std
::
vector
<
std
::
string
>::
iterator
j
=
srclists
.
begin
();
j
!=
srclists
.
end
();
++
j
)
{
m_Makefile
->
ExpandVariablesInString
(
*
j
);
}
m_Makefile
->
AddExecutable
(
exename
.
c_str
(),
srclists
,
use_win32
);
return
true
;
...
...
Source/cmAddLibraryCommand.cxx
View file @
4651dbcf
...
...
@@ -33,7 +33,6 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
std
::
vector
<
std
::
string
>::
const_iterator
s
=
args
.
begin
();
std
::
string
libname
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
libname
);
++
s
;
...
...
@@ -43,7 +42,6 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
if
(
s
!=
args
.
end
())
{
std
::
string
libType
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
libType
);
if
(
libType
==
"STATIC"
)
{
++
s
;
...
...
@@ -64,9 +62,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
std
::
vector
<
std
::
string
>
srclists
;
while
(
s
!=
args
.
end
())
{
std
::
string
copy
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
copy
);
srclists
.
push_back
(
copy
);
srclists
.
push_back
(
*
s
);
++
s
;
}
...
...
Source/cmAddTestCommand.cxx
View file @
4651dbcf
...
...
@@ -38,9 +38,7 @@ bool cmAddTestCommand::InitialPass(std::vector<std::string> const& args)
for
(
std
::
vector
<
std
::
string
>::
const_iterator
j
=
args
.
begin
();
j
!=
args
.
end
();
++
j
)
{
temp
=
*
j
;
m_Makefile
->
ExpandVariablesInString
(
temp
);
m_Args
.
push_back
(
temp
);
m_Args
.
push_back
(
*
j
);
}
return
true
;
...
...
Source/cmBuildCommand.cxx
View file @
4651dbcf
...
...
@@ -33,7 +33,6 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args)
}
std
::
string
makecommand
;
std
::
string
makeprogram
=
args
[
1
];
m_Makefile
->
ExpandVariablesInString
(
makeprogram
);
if
(
makeprogram
.
find
(
"msdev"
)
!=
std
::
string
::
npos
||
makeprogram
.
find
(
"MSDEV"
)
!=
std
::
string
::
npos
)
{
...
...
Source/cmCableClassSetCommand.cxx
View file @
4651dbcf
...
...
@@ -19,21 +19,14 @@
#include "cmTarget.h"
// cmCableClassSetCommand
bool
cmCableClassSetCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
In
)
bool
cmCableClassSetCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
if
(
args
In
.
size
()
<
2
)
if
(
args
.
size
()
<
2
)
{
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
std
::
vector
<
std
::
string
>
args
=
argsIn
;
// First, we want to expand all CMAKE variables in all arguments.
for
(
std
::
vector
<
std
::
string
>::
iterator
a
=
args
.
begin
();
a
!=
args
.
end
();
++
a
)
{
m_Makefile
->
ExpandVariablesInString
(
*
a
);
}
// The first argument is the name of the set.
std
::
vector
<
std
::
string
>::
const_iterator
arg
=
args
.
begin
();
m_ClassSetName
=
*
arg
++
;
...
...
Source/cmCableWrapTclCommand.cxx
View file @
4651dbcf
...
...
@@ -122,22 +122,14 @@ cmCableWrapTclCommand::~cmCableWrapTclCommand()
// cmCableWrapTclCommand
bool
cmCableWrapTclCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
In
)
bool
cmCableWrapTclCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
if
(
args
In
.
size
()
<
2
)
if
(
args
.
size
()
<
2
)
{
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
std
::
vector
<
std
::
string
>
args
=
argsIn
;
// First, we want to expand all CMAKE variables in all arguments.
for
(
std
::
vector
<
std
::
string
>::
iterator
a
=
args
.
begin
();
a
!=
args
.
end
();
++
a
)
{
m_Makefile
->
ExpandVariablesInString
(
*
a
);
}
// Prepare to iterate through the arguments.
std
::
vector
<
std
::
string
>::
const_iterator
arg
=
args
.
begin
();
...
...
Source/cmConfigureFileCommand.cxx
View file @
4651dbcf
...
...
@@ -70,9 +70,7 @@ void cmConfigureFileCommand::FinalPass()
void
cmConfigureFileCommand
::
ConfigureFile
()
{
m_Makefile
->
ExpandVariablesInString
(
m_InputFile
);
m_Makefile
->
AddCMakeDependFile
(
m_InputFile
.
c_str
());
m_Makefile
->
ExpandVariablesInString
(
m_OuputFile
);
cmSystemTools
::
ConvertToUnixSlashes
(
m_OuputFile
);
std
::
string
::
size_type
pos
=
m_OuputFile
.
rfind
(
'/'
);
if
(
pos
!=
std
::
string
::
npos
)
...
...
Source/cmElseCommand.cxx
View file @
4651dbcf
...
...
@@ -51,9 +51,7 @@ bool cmElseCommand::InitialPass(std::vector<std::string> const& args)
if
(
args
.
size
()
==
2
&&
(
args
[
0
]
==
"EXISTS"
))
{
std
::
string
tmp
=
args
[
1
];
m_Makefile
->
ExpandVariablesInString
(
tmp
);
if
(
cmSystemTools
::
FileExists
(
tmp
.
c_str
()))
if
(
cmSystemTools
::
FileExists
(
args
[
1
].
c_str
()))
{
f
=
new
cmIfFunctionBlocker
();
}
...
...
Source/cmEndIfCommand.cxx
View file @
4651dbcf
...
...
@@ -24,7 +24,6 @@ bool cmEndIfCommand::InitialPass(std::vector<std::string> const& args)
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
// remove any function blockers for this define
m_Makefile
->
RemoveFunctionBlocker
(
"ENDIF"
,
args
);
...
...
Source/cmExecProgramCommand.cxx
View file @
4651dbcf
...
...
@@ -18,19 +18,16 @@
#include "cmSystemTools.h"
// cmExecProgramCommand
bool
cmExecProgramCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
In
)
bool
cmExecProgramCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
std
::
vector
<
std
::
string
>
args
=
argsIn
;
if
(
args
.
size
()
<
1
)
{
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
std
::
string
output
;
m_Makefile
->
ExpandVariablesInString
(
args
[
0
]);
if
(
args
.
size
()
==
2
)
{
m_Makefile
->
ExpandVariablesInString
(
args
[
1
]);
cmSystemTools
::
MakeDirectory
(
args
[
1
].
c_str
());
std
::
string
command
;
command
=
"cd "
;
...
...
Source/cmFindFileCommand.cxx
View file @
4651dbcf
...
...
@@ -65,11 +65,8 @@ bool cmFindFileCommand::InitialPass(std::vector<std::string> const& argsIn)
// add any user specified paths
for
(
unsigned
int
j
=
2
;
j
<
args
.
size
();
j
++
)
{
// expand variables
std
::
string
exp
=
args
[
j
];
m_Makefile
->
ExpandVariablesInString
(
exp
);
// Glob the entry in case of wildcards.
cmSystemTools
::
GlobDirs
(
exp
.
c_str
(),
path
);
cmSystemTools
::
GlobDirs
(
args
[
j
]
.
c_str
(),
path
);
}
// add the standard path
...
...
Source/cmFindLibraryCommand.cxx
View file @
4651dbcf
...
...
@@ -63,14 +63,12 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn)
}
else
{
m_Makefile
->
ExpandVariablesInString
(
args
[
j
]);
if
(
doingNames
)
{
names
.
push_back
(
args
[
j
]);
}
else
{
cmSystemTools
::
ExpandRegistryValues
(
args
[
j
]);
// Glob the entry in case of wildcards.
cmSystemTools
::
GlobDirs
(
args
[
j
].
c_str
(),
path
);
}
...
...
@@ -87,7 +85,6 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn)
{
// expand variables
std
::
string
exp
=
args
[
j
];
m_Makefile
->
ExpandVariablesInString
(
exp
);
cmSystemTools
::
ExpandRegistryValues
(
exp
);
// Glob the entry in case of wildcards.
...
...
Source/cmFindPathCommand.cxx
View file @
4651dbcf
...
...
@@ -68,7 +68,6 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
{
// expand variables
std
::
string
exp
=
args
[
j
];
m_Makefile
->
ExpandVariablesInString
(
exp
);
cmSystemTools
::
ExpandRegistryValues
(
exp
);
// Glob the entry in case of wildcards.
...
...
Source/cmFindProgramCommand.cxx
View file @
4651dbcf
...
...
@@ -86,7 +86,6 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string> const& argsIn)
}
else
{
m_Makefile
->
ExpandVariablesInString
(
args
[
j
]);
if
(
doingNames
)
{
names
.
push_back
(
args
[
j
]);
...
...
@@ -110,7 +109,6 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string> const& argsIn)
{
// expand variables
std
::
string
exp
=
args
[
j
];
m_Makefile
->
ExpandVariablesInString
(
exp
);
cmSystemTools
::
ExpandRegistryValues
(
exp
);
// Glob the entry in case of wildcards.
...
...
Source/cmGetFilenameComponentCommand.cxx
View file @
4651dbcf
...
...
@@ -39,7 +39,6 @@ bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const&
std
::
string
result
;
std
::
string
filename
=
args
[
1
];
m_Makefile
->
ExpandVariablesInString
(
filename
);
if
(
args
[
2
]
==
"PATH"
)
{
...
...
Source/cmIfCommand.cxx
View file @
4651dbcf
...
...
@@ -76,7 +76,6 @@ bool cmIfCommand::InitialPass(std::vector<std::string> const& args)
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
// create a function blocker
cmIfFunctionBlocker
*
f
=
NULL
;
...
...
@@ -112,9 +111,7 @@ bool cmIfCommand::InitialPass(std::vector<std::string> const& args)
if
(
args
.
size
()
==
2
&&
(
args
[
0
]
==
"EXISTS"
))
{
std
::
string
tmp
=
args
[
1
];
m_Makefile
->
ExpandVariablesInString
(
tmp
);
if
(
!
cmSystemTools
::
FileExists
(
tmp
.
c_str
()))
if
(
!
cmSystemTools
::
FileExists
(
args
[
1
].
c_str
()))
{
f
=
new
cmIfFunctionBlocker
();
}
...
...
Source/cmIncludeCommand.cxx
View file @
4651dbcf
...
...
@@ -18,15 +18,13 @@
// cmIncludeCommand
bool
cmIncludeCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
In
)
bool
cmIncludeCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
if
(
args
In
.
size
()
<
1
||
args
In
.
size
()
>
2
)
if
(
args
.
size
()
<
1
||
args
.
size
()
>
2
)
{
this
->
SetError
(
"called with wrong number of arguments. "
"Include only takes one file."
);
}
std
::
vector
<
std
::
string
>
args
=
argsIn
;
m_Makefile
->
ExpandVariablesInString
(
args
[
0
]);
bool
exists
=
cmSystemTools
::
FileExists
(
args
[
0
].
c_str
());
if
(
args
.
size
()
==
2
&&
args
[
1
]
==
"OPTIONAL"
&&
!
exists
)
{
...
...
Source/cmIncludeExternalMSProjectCommand.cxx
View file @
4651dbcf
...
...
@@ -29,7 +29,6 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> con
if
(
m_Makefile
->
GetDefinition
(
"WIN32"
))
{
std
::
string
location
=
args
[
1
];
m_Makefile
->
ExpandVariablesInString
(
location
);
std
::
vector
<
std
::
string
>
name_and_location
;
name_and_location
.
push_back
(
args
[
0
]);
...
...
Source/cmInstallFilesCommand.cxx
View file @
4651dbcf
...
...
@@ -61,7 +61,6 @@ void cmInstallFilesCommand::FinalPass()
{
// replace any variables
std
::
string
temps
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
temps
);
// look for a srclist
if
(
m_Makefile
->
GetSources
().
find
(
temps
)
!=
m_Makefile
->
GetSources
().
end
())
{
...
...
@@ -88,7 +87,6 @@ void cmInstallFilesCommand::FinalPass()
{
std
::
vector
<
std
::
string
>
files
;
std
::
string
regex
=
m_FinalArgs
[
0
].
c_str
();
m_Makefile
->
ExpandVariablesInString
(
regex
);
cmSystemTools
::
Glob
(
m_Makefile
->
GetCurrentDirectory
(),
regex
.
c_str
(),
files
);
...
...
Source/cmInstallProgramsCommand.cxx
View file @
4651dbcf
...
...
@@ -55,11 +55,8 @@ void cmInstallProgramsCommand::FinalPass()
for
(
std
::
vector
<
std
::
string
>::
iterator
s
=
m_FinalArgs
.
begin
();
s
!=
m_FinalArgs
.
end
();
++
s
)
{
// replace any variables
std
::
string
temps
=
*
s
;
m_Makefile
->
ExpandVariablesInString
(
temps
);
// add to the result
targetSourceLists
.
push_back
(
temp
s
);
targetSourceLists
.
push_back
(
*
s
);
}
}
else
// reg exp list
...
...
Source/cmLoadCacheCommand.cxx
View file @
4651dbcf
...
...
@@ -18,13 +18,12 @@
// cmLoadcacheCommand
bool
cmLoadCacheCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
In
)
bool
cmLoadCacheCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
if
(
args
In
.
size
()
<
1
)
if
(
args
.
size
()
<
1
)
{
this
->
SetError
(
"called with wrong number of arguments."
);
}
std
::
vector
<
std
::
string
>
args
=
argsIn
;
// Cache entries to be excluded from the import list.
// If this set is empty, all cache entries are brought in
...
...
@@ -37,7 +36,6 @@ bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn)
{
if
(
excludeFiles
)
{
m_Makefile
->
ExpandVariablesInString
(
args
[
i
]);
excludes
.
insert
(
args
[
i
]);
}
if
(
args
[
i
]
==
"EXCLUDE"
)
...
...
@@ -60,7 +58,6 @@ bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn)
{
if
(
includeFiles
)
{
m_Makefile
->
ExpandVariablesInString
(
args
[
i
]);
includes
.
insert
(
args
[
i
]);
}
if
(
args
[
i
]
==
"INCLUDE_INTERNALS"
)
...
...
@@ -81,7 +78,6 @@ bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn)
{
break
;
}
m_Makefile
->
ExpandVariablesInString
(
args
[
i
]);
cmCacheManager
::
GetInstance
()
->
LoadCache
(
args
[
i
].
c_str
(),
false
,
excludes
,
includes
);
}
...
...
Source/cmMakeDirectoryCommand.cxx
View file @
4651dbcf
...
...
@@ -25,9 +25,7 @@ bool cmMakeDirectoryCommand::InitialPass(std::vector<std::string> const& args)
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
std
::
string
arg
=
args
[
0
];
m_Makefile
->
ExpandVariablesInString
(
arg
);
cmSystemTools
::
MakeDirectory
(
arg
.
c_str
());
cmSystemTools
::
MakeDirectory
(
args
[
0
].
c_str
());
return
true
;
}
Source/cmMakefile.cxx
View file @
4651dbcf
...
...
@@ -210,7 +210,13 @@ void cmMakefile::ExecuteCommand(std::string &name,
// if the command is inherited then InitialPass it.
if
(
!
m_Inheriting
||
usedCommand
->
IsInherited
())
{
if
(
!
usedCommand
->
InitialPass
(
arguments
))
std
::
vector
<
std
::
string
>
expandedArguments
=
arguments
;
for
(
std
::
vector
<
std
::
string
>::
iterator
i
=
expandedArguments
.
begin
();
i
!=
expandedArguments
.
end
();
++
i
)
{
this
->
ExpandVariablesInString
(
*
i
);
}
if
(
!
usedCommand
->
InitialPass
(
expandedArguments
))
{
cmSystemTools
::
Error
(
usedCommand
->
GetName
(),
": Error :
\n
"
,
...
...
@@ -1171,10 +1177,16 @@ bool cmMakefile::IsFunctionBlocked(const char *name,
{
// loop over all function blockers to see if any block this command
std
::
set
<
cmFunctionBlocker
*>::
const_iterator
pos
;
std
::
vector
<
std
::
string
>
expandedArguments
=
args
;
for
(
std
::
vector
<
std
::
string
>::
iterator
i
=
expandedArguments
.
begin
();
i
!=
expandedArguments
.
end
();
++
i
)
{
this
->
ExpandVariablesInString
(
*
i
);
}
for
(
pos
=
m_FunctionBlockers
.
begin
();
pos
!=
m_FunctionBlockers
.
end
();
++
pos
)
{
if
((
*
pos
)
->
IsFunctionBlocked
(
name
,
arg
s
,
*
this
))
if
((
*
pos
)
->
IsFunctionBlocked
(
name
,
expandedArgument
s
,
*
this
))
{
return
true
;
}
...
...
Source/cmMessageCommand.cxx
View file @
4651dbcf
...
...
@@ -31,7 +31,6 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args)
{
message
+=
*
i
;
}
m_Makefile
->
ExpandVariablesInString
(
message
);
cmSystemTools
::
Message
(
message
.
c_str
());
return
true
;
}
...
...
Source/cmOptionCommand.cxx
View file @
4651dbcf
...
...
@@ -35,7 +35,6 @@ bool cmOptionCommand::InitialPass(std::vector<std::string> const& args)
if
(
args
.
size
()
==
3
)
{
initialValue
=
args
[
2
];
m_Makefile
->
ExpandVariablesInString
(
initialValue
);
}
m_Makefile
->
AddCacheDefinition
(
args
[
0
].
c_str
(),
cmSystemTools
::
IsOn
(
initialValue
.
c_str
()),
...
...
Source/cmOutputRequiredFilesCommand.cxx
View file @
4651dbcf
...
...
@@ -185,10 +185,6 @@ void cmOutputRequiredFilesCommand::FinalPass()
cmLBDepend
md
;
md
.
SetMakefile
(
m_Makefile
);
// always expand the first argument
m_Makefile
->
ExpandVariablesInString
(
m_File
);
m_Makefile
->
ExpandVariablesInString
(
m_OutputFile
);
// find the depends for a file
const
cmDependInformation
*
info
=
md
.
FindDependencies
(
m_File
.
c_str
());
if
(
info
)
...
...
Source/cmSetCommand.cxx
View file @
4651dbcf
...
...
@@ -88,8 +88,6 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
type
=
cmCacheManager
::
StringToType
(
args
[
cacheStart
+
1
].
c_str
());
docstring
=
args
[
cacheStart
+
2
].
c_str
();
}
// always expand the first argument
m_Makefile
->
ExpandVariablesInString
(
value
);
// get the current cache value for the variable
const
char
*
cacheValue
=
m_Makefile
->
GetDefinition
(
variable
);
...
...
Source/cmSourceFilesCommand.cxx
View file @
4651dbcf
...
...
@@ -26,7 +26,6 @@ bool cmSourceFilesCommand::InitialPass(std::vector<std::string> const& args)
}
std
::
string
name
=
args
[
0
];
m_Makefile
->
ExpandVariablesInString
(
name
);
int
generated
=
0
;
...
...
@@ -42,7 +41,6 @@ bool cmSourceFilesCommand::InitialPass(std::vector<std::string> const& args)
continue
;
}
cmSourceFile
file
;
m_Makefile
->
ExpandVariablesInString
(
copy
);
file
.
SetIsAnAbstractClass
(
false
);
std
::
string
path
=
cmSystemTools
::
GetFilenamePath
(
copy
);
if
(
generated
)
...
...
Source/cmSubdirCommand.cxx
View file @
4651dbcf
...
...
@@ -24,12 +24,10 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args)
this
->
SetError
(
"called with incorrect number of arguments"
);
return
false
;
}
std
::
string
temp
;
for
(
std
::
vector
<
std
::
string
>::
const_iterator
i
=
args
.
begin
();
i
!=
args
.
end
();
++
i
)
{
temp
=
*
i
;
m_Makefile
->
AddSubDirectory
(
m_Makefile
->
ExpandVariablesInString
(
temp
));
m_Makefile
->
AddSubDirectory
(
i
->
c_str
());
}
return
true
;
}
...
...
Source/cmSystemTools.cxx
View file @
4651dbcf
...
...
@@ -1040,7 +1040,6 @@ bool cmSystemTools::RunCommand(const char* command,
retVal
=
pclose
(
cpipe
);
retVal
=
WEXITSTATUS
(
retVal
);
std
::
cout
<<
"*** cmSystemTools: return value from "
<<
command
<<
" is "
<<
retVal
<<
"
\n
"
;
return
true
;
#endif
}
...
...
Source/cmUnixMakefileGenerator.cxx
View file @
4651dbcf
...
...
@@ -1796,7 +1796,7 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"run any tests"
,
"test"
,
""
,
ctest
.
c_str
());
this
->
ConvertToOutputPath
(
ctest
.
c_str
())
.
c_str
());
}
}
...
...
Source/cmUseMangledMesaCommand.cxx
View file @
4651dbcf
...
...
@@ -18,19 +18,16 @@
#include "cmSystemTools.h"