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
4e8f242d
Commit
4e8f242d
authored
Jun 03, 2015
by
Stephen Kelly
Committed by
Brad King
Jun 04, 2015
Browse files
cmMakefile: Store unconfigured cmMakefiles.
Not cmLocalGenerators.
parent
d65e0123
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
4e8f242d
...
...
@@ -1598,13 +1598,13 @@ void cmMakefile::Configure()
this
->
ProcessBuildsystemFile
(
currentStart
.
c_str
());
// at the end handle any old style subdirs
std
::
vector
<
cm
LocalGenerator
*>
subdirs
=
this
->
UnConfiguredDirectories
;
std
::
vector
<
cm
Makefile
*>
subdirs
=
this
->
UnConfiguredDirectories
;
// for each subdir recurse
std
::
vector
<
cm
LocalGenerator
*>::
iterator
sdi
=
subdirs
.
begin
();
std
::
vector
<
cm
Makefile
*>::
iterator
sdi
=
subdirs
.
begin
();
for
(;
sdi
!=
subdirs
.
end
();
++
sdi
)
{
this
->
ConfigureSubDirectory
(
(
*
sdi
)
->
GetMakefile
())
;
this
->
ConfigureSubDirectory
(
*
sdi
);
}
this
->
AddCMakeDependFilesFromUser
();
...
...
@@ -1699,7 +1699,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
}
else
{
this
->
UnConfiguredDirectories
.
push_back
(
lg2
);
this
->
UnConfiguredDirectories
.
push_back
(
lg2
->
GetMakefile
()
);
}
}
...
...
Source/cmMakefile.h
View file @
4e8f242d
...
...
@@ -922,7 +922,7 @@ private:
mutable
cmsys
::
RegularExpression
cmAtVarRegex
;
mutable
cmsys
::
RegularExpression
cmNamedCurly
;
std
::
vector
<
cm
LocalGenerator
*>
UnConfiguredDirectories
;
std
::
vector
<
cm
Makefile
*>
UnConfiguredDirectories
;
cmPropertyMap
Properties
;
...
...
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